[arch-commits] Commit in ppl/trunk (PKGBUILD ppl-0.10.2-gmp-5.0.patch)

[Allan McRae]

    Date: Thursday, March 18, 2010 @ 23:03:03
  Author: allan
Revision: 72640

upgpkg: ppl 0.10.2-3
gmp5 rebuild

Added:
  ppl/trunk/ppl-0.10.2-gmp-5.0.patch
Modified:
  ppl/trunk/PKGBUILD

--------------------------+
 PKGBUILD                 |   13 +++++++++----
 ppl-0.10.2-gmp-5.0.patch |   30 ++++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-03-19 03:00:47 UTC (rev 72639)
+++ PKGBUILD	2010-03-19 03:03:03 UTC (rev 72640)
@@ -4,18 +4,23 @@
 
 pkgname=ppl
 pkgver=0.10.2
-pkgrel=2
+pkgrel=3
 pkgdesc="A modern library for convex polyhedra and other numerical abstractions."
 arch=('i686' 'x86_64')
 url="http://www.cs.unipr.it/ppl"
 license=('GPL3')
-depends=('gmp>=4.1.3')
+depends=('gmp>=5.0')
 options=('!docs' '!libtool')
-source=(http://www.cs.unipr.it/ppl/Download/ftp/releases/$pkgver/ppl-$pkgver.tar.gz)
-md5sums=('e7dd265afdeaea81f7e87a72b182d875')
+source=(http://www.cs.unipr.it/ppl/Download/ftp/releases/$pkgver/ppl-$pkgver.tar.gz
+        ppl-0.10.2-gmp-5.0.patch)
+md5sums=('e7dd265afdeaea81f7e87a72b182d875'
+         '4da347693c76ccccba4fb5b60ca0f321')
 
 build() {
   cd $srcdir/ppl-$pkgver
+  patch -Np1 -i $srcdir/ppl-0.10.2-gmp-5.0.patch
+  autoreconf -vf
+
   ./configure --prefix=/usr --enable-interfaces="c,cxx" || return 1
   make || return 1
   make DESTDIR=$pkgdir install || return 1

Added: ppl-0.10.2-gmp-5.0.patch
===================================================================
--- ppl-0.10.2-gmp-5.0.patch	                        (rev 0)
+++ ppl-0.10.2-gmp-5.0.patch	2010-03-19 03:03:03 UTC (rev 72640)
@@ -0,0 +1,30 @@
+diff --git a/m4/ac_check_gmp.m4 b/m4/ac_check_gmp.m4
+index 60cecdc..15acb18 100644
+--- a/m4/ac_check_gmp.m4
++++ b/m4/ac_check_gmp.m4
+@@ -71,6 +71,10 @@ AC_RUN_IFELSE([AC_LANG_SOURCE([[
+ #GMP version 4.1.3 or higher is required
+ #endif
+ 
++#ifndef BITS_PER_MP_LIMB
++#define BITS_PER_MP_LIMB GMP_LIMB_BITS
++#endif
++
+ int
+ main() {
+   std::string header_version;
+@@ -97,11 +101,11 @@ main() {
+     return 1;
+   }
+ 
+-  if (sizeof(mp_limb_t)*CHAR_BIT != GMP_LIMB_BITS
+-      || GMP_LIMB_BITS != mp_bits_per_limb) {
++  if (sizeof(mp_limb_t)*CHAR_BIT != BITS_PER_MP_LIMB
++      || BITS_PER_MP_LIMB != mp_bits_per_limb) {
+     std::cerr
+       << "GMP header (gmp.h) and library (ligmp.*) bits-per-limb mismatch:\n"
+-      << "header gives " << __GMP_BITS_PER_MP_LIMB << ";\n"
++      << "header gives " << BITS_PER_MP_LIMB << ";\n"
+       << "library gives " << mp_bits_per_limb << ".\n"
+       << "This probably means you are on a bi-arch system and\n"
+       << "you are compiling with the wrong header or linking with\n"