[PATCHv2] Fix crosstool-ng build when local system has libgmp already installed
Solomon Peachy
pizza@shaftnet.org
Mon Jul 15 23:07:00 GMT 2013
- Solomon
--
Solomon Peachy pizza at shaftnet dot org
Delray Beach, FL ^^ (email/xmpp) ^^
Quidquid latine dictum sit, altum viditur.
-------------- next part --------------
# HG changeset patch
# User Solomon Peachy <pizza@shaftnet.org>
# Date 1373929326 14400
# Mon Jul 15 19:02:06 2013 -0400
# Node ID 188c85288c037e69ff2ba18071bbe812220c8db7
# Parent 58ca31386bfbb48a522724dca79040efd54041c3
Fix crosstool-ng build when local system has libgmp already installed
Basically, the ppl configure script wasn't properly setting
CFLAGS/CXXFLAGS/LDFLAGS to point at the ctng-built gmp, so ppl tried to
use the system gmp headers instead.
This patch fixes that for all GMP versions supported by crosstools-ng.
Signed-off-by: Solomon Peachy <pizza@shaftnet.org>
diff -r 58ca31386bfb -r 188c85288c03 patches/ppl/0.10.2/200-fix-build-with-local-gmp.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/ppl/0.10.2/200-fix-build-with-local-gmp.patch Mon Jul 15 19:02:06 2013 -0400
@@ -0,0 +1,26 @@
+diff -aur ppl-0.10-orig/configure ppl-0.10/configure
+--- ppl-0.10-orig/configure 2008-11-04 04:37:00.000000000 -0500
++++ ppl-0.10/configure 2013-07-15 18:48:26.688013150 -0400
+@@ -15162,6 +15162,9 @@
+ with_libgmpxx_prefix="$with_libgmp_prefix"
+ fi
+ fi
++CPPFLAGS="$CPPFLAGS -I$with_libgmp_prefix/include"
++CXXFLAGS="$CXXFLAGS -I$with_libgmpxx_prefix/include"
++LDFLAGS="$CPPFLAGS -L$with_libgmpxx_prefix/lib -L$with_libgmp_prefix/lib"
+
+
+
+diff -aur ppl-0.10-orig/m4/ac_check_gmp.m4 ppl-0.10/m4/ac_check_gmp.m4
+--- ppl-0.10-orig/m4/ac_check_gmp.m4 2008-10-22 07:43:22.000000000 -0400
++++ ppl-0.10/m4/ac_check_gmp.m4 2013-07-15 18:48:26.669013816 -0400
+@@ -31,6 +31,9 @@
+ with_libgmpxx_prefix="$with_libgmp_prefix"
+ fi
+ fi
++CPPFLAGS="$CPPFLAGS -I$with_libgmp_prefix/include"
++CXXFLAGS="$CXXFLAGS -I$with_libgmpxx_prefix/include"
++LDFLAGS="$CPPFLAGS -L$with_libgmpxx_prefix/lib -L$with_libgmp_prefix/lib"
+
+ dnl Check how to link with libgmp.
+ AC_LIB_LINKFLAGS([gmp])
diff -r 58ca31386bfb -r 188c85288c03 patches/ppl/0.11.1/200-fix-build-with-local-gmp.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/ppl/0.11.1/200-fix-build-with-local-gmp.patch Mon Jul 15 19:02:06 2013 -0400
@@ -0,0 +1,24 @@
+--- a/m4/ac_check_gmp.m4~ 2011-02-27 04:07:47.000000000 -0500
++++ b/m4/ac_check_gmp.m4 2013-07-10 19:57:35.894457259 -0400
+@@ -32,6 +32,9 @@
+ with_libgmpxx_prefix="$with_libgmp_prefix"
+ fi
+ fi
++CPPFLAGS="$CPPFLAGS -I$with_libgmp_prefix/include"
++CXXFLAGS="$CXXFLAGS -I$with_libgmpxx_prefix/include"
++LDFLAGS="$CPPFLAGS -L$with_libgmpxx_prefix/lib -L$with_libgmp_prefix/lib"
+
+ AC_ARG_WITH(gmp-build,
+ AS_HELP_STRING([--with-gmp-build=DIR],
+--- a/configure~ 2011-02-27 04:07:47.000000000 -0500
++++ b/configure 2013-07-10 19:57:35.894457259 -0400
+@@ -10217,6 +10217,9 @@
+ with_libgmpxx_prefix="$with_libgmp_prefix"
+ fi
+ fi
++CPPFLAGS="$CPPFLAGS -I$with_libgmp_prefix/include"
++CXXFLAGS="$CXXFLAGS -I$with_libgmpxx_prefix/include"
++LDFLAGS="$CPPFLAGS -L$with_libgmpxx_prefix/lib -L$with_libgmp_prefix/lib"
+
+
+ # Check whether --with-gmp-build was given.
diff -r 58ca31386bfb -r 188c85288c03 patches/ppl/0.11.2/200-fix-build-with-local-gmp.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/ppl/0.11.2/200-fix-build-with-local-gmp.patch Mon Jul 15 19:02:06 2013 -0400
@@ -0,0 +1,24 @@
+--- a/m4/ac_check_gmp.m4~ 2011-02-27 04:07:47.000000000 -0500
++++ b/m4/ac_check_gmp.m4 2013-07-10 19:57:35.894457259 -0400
+@@ -32,6 +32,9 @@
+ with_libgmpxx_prefix="$with_libgmp_prefix"
+ fi
+ fi
++CPPFLAGS="$CPPFLAGS -I$with_libgmp_prefix/include"
++CXXFLAGS="$CXXFLAGS -I$with_libgmpxx_prefix/include"
++LDFLAGS="$CPPFLAGS -L$with_libgmpxx_prefix/lib -L$with_libgmp_prefix/lib"
+
+ AC_ARG_WITH(gmp-build,
+ AS_HELP_STRING([--with-gmp-build=DIR],
+--- a/configure~ 2011-02-27 04:07:47.000000000 -0500
++++ b/configure 2013-07-10 19:57:35.894457259 -0400
+@@ -10217,6 +10217,9 @@
+ with_libgmpxx_prefix="$with_libgmp_prefix"
+ fi
+ fi
++CPPFLAGS="$CPPFLAGS -I$with_libgmp_prefix/include"
++CXXFLAGS="$CXXFLAGS -I$with_libgmpxx_prefix/include"
++LDFLAGS="$CPPFLAGS -L$with_libgmpxx_prefix/lib -L$with_libgmp_prefix/lib"
+
+
+ # Check whether --with-gmp-build was given.
diff -r 58ca31386bfb -r 188c85288c03 patches/ppl/0.11/200-fix-build-with-local-gmp.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/ppl/0.11/200-fix-build-with-local-gmp.patch Mon Jul 15 19:02:06 2013 -0400
@@ -0,0 +1,24 @@
+--- a/m4/ac_check_gmp.m4~ 2011-02-27 04:07:47.000000000 -0500
++++ b/m4/ac_check_gmp.m4 2013-07-10 19:57:35.894457259 -0400
+@@ -32,6 +32,9 @@
+ with_libgmpxx_prefix="$with_libgmp_prefix"
+ fi
+ fi
++CPPFLAGS="$CPPFLAGS -I$with_libgmp_prefix/include"
++CXXFLAGS="$CXXFLAGS -I$with_libgmpxx_prefix/include"
++LDFLAGS="$CPPFLAGS -L$with_libgmpxx_prefix/lib -L$with_libgmp_prefix/lib"
+
+ AC_ARG_WITH(gmp-build,
+ AS_HELP_STRING([--with-gmp-build=DIR],
+--- a/configure~ 2011-02-27 04:07:47.000000000 -0500
++++ b/configure 2013-07-10 19:57:35.894457259 -0400
+@@ -10217,6 +10217,9 @@
+ with_libgmpxx_prefix="$with_libgmp_prefix"
+ fi
+ fi
++CPPFLAGS="$CPPFLAGS -I$with_libgmp_prefix/include"
++CXXFLAGS="$CXXFLAGS -I$with_libgmpxx_prefix/include"
++LDFLAGS="$CPPFLAGS -L$with_libgmpxx_prefix/lib -L$with_libgmp_prefix/lib"
+
+
+ # Check whether --with-gmp-build was given.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 190 bytes
Desc: not available
URL: <http://sourceware.org/pipermail/crossgcc/attachments/20130715/befd90b7/attachment.sig>
More information about the crossgcc
mailing list