diff --git a/dev-libs/isl/isl-0.13.recipe b/dev-libs/isl/isl-0.16.1.recipe similarity index 82% rename from dev-libs/isl/isl-0.13.recipe rename to dev-libs/isl/isl-0.16.1.recipe index c204fd367..7799da48a 100644 --- a/dev-libs/isl/isl-0.13.recipe +++ b/dev-libs/isl/isl-0.16.1.recipe @@ -13,14 +13,14 @@ COPYRIGHT="2011 Sven Verdoolaege LICENSE="MIT" REVISION="1" SOURCE_URI="http://isl.gforge.inria.fr/isl-$portVersion.tar.bz2" -CHECKSUM_SHA256="7265fd897b7f9147fde76560f28ed18f2c20e5f5da7f4bd9d0e01f8a713401f1" +CHECKSUM_SHA256="412538bb65c799ac98e17e8cfcdacbb257a57362acfaaff254b0fcae970126d2" ARCHITECTURES="!x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86" PROVIDES=" isl$secondaryArchSuffix = $portVersion compat >= 0.12 - lib:libisl$secondaryArchSuffix = 13.0.0 compat >= 13 + lib:libisl$secondaryArchSuffix = 15.1.1 compat >= 15 " REQUIRES=" haiku$secondaryArchSuffix @@ -29,11 +29,14 @@ REQUIRES=" PROVIDES_devel=" isl${secondaryArchSuffix}_devel = $portVersion compat >= 0.12 - devel:libisl$secondaryArchSuffix = 13.0.0 compat >= 13 + devel:libisl$secondaryArchSuffix = 15.1.1 compat >= 15 " REQUIRES_devel=" isl$secondaryArchSuffix == $portVersion base " +CONFLICTS_devel=" + isl13${secondaryArchSuffix}_devel + " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel @@ -60,6 +63,9 @@ BUILD() INSTALL() { make install + + # remove libtool file + rm $libDir/libisl.la prepareInstalledDevelLibs libisl fixPkgconfig @@ -68,3 +74,8 @@ INSTALL() packageEntries devel \ $developDir } + +TEST() +{ + make check +} diff --git a/dev-libs/isl/isl-0.14.recipe b/dev-libs/isl/isl13-0.14.recipe similarity index 86% rename from dev-libs/isl/isl-0.14.recipe rename to dev-libs/isl/isl13-0.14.recipe index 1172b1a03..9cfb36d83 100644 --- a/dev-libs/isl/isl-0.14.recipe +++ b/dev-libs/isl/isl13-0.14.recipe @@ -14,12 +14,13 @@ LICENSE="MIT" REVISION="1" SOURCE_URI="http://isl.gforge.inria.fr/isl-$portVersion.tar.bz2" CHECKSUM_SHA256="7e3c02ff52f8540f6a85534f54158968417fd676001651c8289c705bd0228f36" +SOURCE_DIR="isl-$portVersion" ARCHITECTURES="!x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86" PROVIDES=" - isl$secondaryArchSuffix = $portVersion compat >= 0.12 + isl13$secondaryArchSuffix = $portVersion compat >= 0.12 lib:libisl$secondaryArchSuffix = 13.1.0 compat >= 13 " REQUIRES=" @@ -28,11 +29,11 @@ REQUIRES=" " PROVIDES_devel=" - isl${secondaryArchSuffix}_devel = $portVersion compat >= 0.12 + isl13${secondaryArchSuffix}_devel = $portVersion compat >= 0.12 devel:libisl$secondaryArchSuffix = 13.1.0 compat >= 13 " REQUIRES_devel=" - isl$secondaryArchSuffix == $portVersion base + isl13$secondaryArchSuffix == $portVersion base " BUILD_REQUIRES=" @@ -61,6 +62,9 @@ INSTALL() { make install + # remove libtool file + rm $libDir/libisl.la + prepareInstalledDevelLibs libisl fixPkgconfig