From 5dd13bd76b33ee933f9ce3c4056925b1afe4b58d Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Thu, 5 Jul 2018 18:12:08 +0200 Subject: [PATCH] isl, bump version (#2706) --- .../isl/{isl-0.18.recipe => isl-0.19.recipe} | 22 +++++++++---------- dev-libs/isl/isl13-0.14.recipe | 5 ++++- 2 files changed, 15 insertions(+), 12 deletions(-) rename dev-libs/isl/{isl-0.18.recipe => isl-0.19.recipe} (76%) diff --git a/dev-libs/isl/isl-0.18.recipe b/dev-libs/isl/isl-0.19.recipe similarity index 76% rename from dev-libs/isl/isl-0.18.recipe rename to dev-libs/isl/isl-0.19.recipe index dd0272700..3d827da5a 100644 --- a/dev-libs/isl/isl-0.18.recipe +++ b/dev-libs/isl/isl-0.19.recipe @@ -15,34 +15,34 @@ COPYRIGHT="2015-2016 Polly Labs LICENSE="MIT" REVISION="1" SOURCE_URI="http://isl.gforge.inria.fr/isl-$portVersion.tar.bz2" -CHECKSUM_SHA256="6b8b0fd7f81d0a957beb3679c81bbb34ccc7568d5682844d8924424a0dadcb1b" +CHECKSUM_SHA256="d59726f34f7852a081fbd3defd1ab2136f174110fc2e0c8d10bb122173fa9ed8" ARCHITECTURES="!x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86" +libVersion=19.0.0 +libVersionCompat="$libVersion compat >= ${libVersion%%.*}" + PROVIDES=" - isl$secondaryArchSuffix = $portVersion compat >= 0.12 - lib:libisl$secondaryArchSuffix = 15.3.0 compat >= 15 + isl$secondaryArchSuffix = $portVersion + lib:libisl$secondaryArchSuffix = $libVersionCompat " REQUIRES=" haiku$secondaryArchSuffix - lib:libgmp$secondaryArchSuffix >= 10.1.3 + lib:libgmp$secondaryArchSuffix " PROVIDES_devel=" - isl${secondaryArchSuffix}_devel = $portVersion compat >= 0.12 - devel:libisl$secondaryArchSuffix = 15.3.0 compat >= 15 + isl${secondaryArchSuffix}_devel = $portVersion + devel:libisl$secondaryArchSuffix = $libVersionCompat " REQUIRES_devel=" isl$secondaryArchSuffix == $portVersion base " -CONFLICTS_devel=" - isl13${secondaryArchSuffix}_devel - " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - devel:libgmp$secondaryArchSuffix >= 10.1.3 + devel:libgmp$secondaryArchSuffix " BUILD_PREREQUIRES=" cmd:aclocal @@ -56,7 +56,7 @@ BUILD_PREREQUIRES=" " defineDebugInfoPackage isl$secondaryArchSuffix \ - $libDir/libisl.so.15.3.0 + $libDir/libisl.so.$libVersion BUILD() { diff --git a/dev-libs/isl/isl13-0.14.recipe b/dev-libs/isl/isl13-0.14.recipe index 049f5270a..42b406511 100644 --- a/dev-libs/isl/isl13-0.14.recipe +++ b/dev-libs/isl/isl13-0.14.recipe @@ -11,7 +11,7 @@ COPYRIGHT="2011 Sven Verdoolaege 2012-2014 Ecole Normale Superieure 2006-2007, 2012 Universiteit Leiden" LICENSE="MIT" -REVISION="3" +REVISION="4" SOURCE_URI="http://isl.gforge.inria.fr/isl-$portVersion.tar.bz2" CHECKSUM_SHA256="7e3c02ff52f8540f6a85534f54158968417fd676001651c8289c705bd0228f36" SOURCE_DIR="isl-$portVersion" @@ -35,6 +35,9 @@ PROVIDES_devel=" REQUIRES_devel=" isl13$secondaryArchSuffix == $portVersion base " +CONFLICTS_devel=" + isl${secondaryArchSuffix}_devel + " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel