patches/ppl/0.10.2/200-fix-build-with-local-gmp.patch
author "Yann E. MORIN" <yann.morin.1998@free.fr>
Tue Mar 11 22:11:43 2014 +0100 (2014-03-11)
changeset 3293 e11a8a2e225d
permissions -rw-r--r--
comptools: do not force build of make-3.81 unless really needed

On systems with make-3.82, we forcibly force the build and the use
of make-3.81

But some newer tools break when building with make-3.81. For example,
eglibc-3.18 breaks.

Introduce a new blind options that tools may select if they require
make-3.81. If the system does not have make-3.81, and this option is
selected, then we force the build of make-3.81. Otherwise, we leave
it to the user to decide on his own.

Note that no component selects this option for now. It will come in
later patches as we find them.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
yann@3226
     1
diff -aur ppl-0.10-orig/configure ppl-0.10/configure
yann@3226
     2
--- ppl-0.10-orig/configure	2008-11-04 04:37:00.000000000 -0500
yann@3226
     3
+++ ppl-0.10/configure	2013-07-15 18:48:26.688013150 -0400
yann@3226
     4
@@ -15162,6 +15162,9 @@
yann@3226
     5
     with_libgmpxx_prefix="$with_libgmp_prefix"
yann@3226
     6
   fi
yann@3226
     7
 fi
yann@3226
     8
+CPPFLAGS="$CPPFLAGS -I$with_libgmp_prefix/include"
yann@3226
     9
+CXXFLAGS="$CXXFLAGS -I$with_libgmpxx_prefix/include"
yann@3226
    10
+LDFLAGS="$CPPFLAGS -L$with_libgmpxx_prefix/lib -L$with_libgmp_prefix/lib"
yann@3226
    11
 
yann@3226
    12
 
yann@3226
    13
 
yann@3226
    14
diff -aur ppl-0.10-orig/m4/ac_check_gmp.m4 ppl-0.10/m4/ac_check_gmp.m4
yann@3226
    15
--- ppl-0.10-orig/m4/ac_check_gmp.m4	2008-10-22 07:43:22.000000000 -0400
yann@3226
    16
+++ ppl-0.10/m4/ac_check_gmp.m4	2013-07-15 18:48:26.669013816 -0400
yann@3226
    17
@@ -31,6 +31,9 @@
yann@3226
    18
     with_libgmpxx_prefix="$with_libgmp_prefix"
yann@3226
    19
   fi
yann@3226
    20
 fi
yann@3226
    21
+CPPFLAGS="$CPPFLAGS -I$with_libgmp_prefix/include"
yann@3226
    22
+CXXFLAGS="$CXXFLAGS -I$with_libgmpxx_prefix/include"
yann@3226
    23
+LDFLAGS="$CPPFLAGS -L$with_libgmpxx_prefix/lib -L$with_libgmp_prefix/lib"
yann@3226
    24
 
yann@3226
    25
 dnl Check how to link with libgmp.
yann@3226
    26
 AC_LIB_LINKFLAGS([gmp])