diff options
author | Yann E. MORIN" <yann.morin.1998@free.fr> | 2013-07-24 19:11:18 +0200 |
---|---|---|
committer | Yann E. MORIN" <yann.morin.1998@free.fr> | 2013-07-24 19:11:18 +0200 |
commit | c36dfeaacd714bba91037f21211268553d52b847 (patch) | |
tree | 905aa3e69b30ba87653895e1f07501dd23792733 | |
parent | 2aa92300fd5630d60f181103fe2e7727487a4dbc (diff) | |
download | crosstool-ng-c36dfeaacd714bba91037f21211268553d52b847.tar.gz crosstool-ng-c36dfeaacd714bba91037f21211268553d52b847.tar.bz2 crosstool-ng-c36dfeaacd714bba91037f21211268553d52b847.zip |
complibs/ppl: fix 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 PPL versions supported by crosstools-ng.
Signed-off-by: Solomon Peachy <pizza@shaftnet.org>
[yann.morin.1998@free.fr: slightly touch the commit log]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Message-Id: <20130715230656.GB23382@shaftnet.org>
Patchwork-Id: 259300
4 files changed, 98 insertions, 0 deletions
diff --git a/patches/ppl/0.10.2/200-fix-build-with-local-gmp.patch b/patches/ppl/0.10.2/200-fix-build-with-local-gmp.patch new file mode 100644 index 00000000..7f9d625a --- /dev/null +++ b/patches/ppl/0.10.2/200-fix-build-with-local-gmp.patch @@ -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 --git a/patches/ppl/0.11.1/200-fix-build-with-local-gmp.patch b/patches/ppl/0.11.1/200-fix-build-with-local-gmp.patch new file mode 100644 index 00000000..a4bb9f18 --- /dev/null +++ b/patches/ppl/0.11.1/200-fix-build-with-local-gmp.patch @@ -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 --git a/patches/ppl/0.11.2/200-fix-build-with-local-gmp.patch b/patches/ppl/0.11.2/200-fix-build-with-local-gmp.patch new file mode 100644 index 00000000..a4bb9f18 --- /dev/null +++ b/patches/ppl/0.11.2/200-fix-build-with-local-gmp.patch @@ -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 --git a/patches/ppl/0.11/200-fix-build-with-local-gmp.patch b/patches/ppl/0.11/200-fix-build-with-local-gmp.patch new file mode 100644 index 00000000..a4bb9f18 --- /dev/null +++ b/patches/ppl/0.11/200-fix-build-with-local-gmp.patch @@ -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. |