From f173e77e326dc09b553a2d8ce9b323f88da4b22b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Th=C3=A9baudeau=22?= Date: Fri, 27 Jan 2012 13:31:16 +0100 Subject: complibs/cloog: fix linking with libm MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In Ubuntu 11.04 and 11.10, the default options for ld have changed. --no-copy-dt-needed-entries and --as-needed are now enabled by default, which causes errors like: [EXTRA] Checking CLooG/ppl [DEBUG] ==> Executing: 'make' '-j3' '-s' 'check' [ALL ] Making check in . [ALL ] config.status: creating include/cloog/cloog-config.h [ALL ] config.status: include/cloog/cloog-config.h is unchanged [ALL ] libtool: link: i686-build_pc-linux-gnu-gcc -Wall -fomit-frame-pointer -pipe -o cloog cloog.o -L//build/static/lib ./.libs/libcloog.a -lm //build/static/lib/libppl_c.a //build/static/lib/libpwl.a //build/static/lib/libppl.a //build/static/lib/libgmpxx.a //build/static/lib/libgmp.a -lstdc++ [ALL ] /usr/bin/ld: //build/static/lib/libppl.a(MIP_Problem.o): undefined reference to symbol 'sqrt@@GLIBC_2.0' [ALL ] /usr/bin/ld: note: 'sqrt@@GLIBC_2.0' is defined in DSO /usr/lib/gcc/i686-linux-gnu/4.6.1/../../../i386-linux-gnu/libm.so so try adding it to the linker command line [ALL ] /usr/lib/gcc/i686-linux-gnu/4.6.1/../../../i386-linux-gnu/libm.so: could not read symbols: Invalid operation [ALL ] collect2: ld returned 1 exit status [ERROR] make[2]: *** [cloog] Error 1 [ERROR] make[1]: *** [check-recursive] Error 1 See: https://wiki.ubuntu.com/NattyNarwhal/ToolchainTransition This patch fixes these errors by placing '-lm' at the right place on the command line as libppl requires libm when linking cloog. Signed-off-by: "Benoît Thébaudeau" diff --git a/patches/cloog-ppl/0.15.10/100-add_on_libs_position.patch b/patches/cloog-ppl/0.15.10/100-add_on_libs_position.patch new file mode 100644 index 0000000..2e97b5a --- /dev/null +++ b/patches/cloog-ppl/0.15.10/100-add_on_libs_position.patch @@ -0,0 +1,24 @@ +diff -Naurd cloog-ppl-0.15.10-a/configure cloog-ppl-0.15.10-b/configure +--- cloog-ppl-0.15.10-a/configure 2010-08-27 21:14:33.000000000 +0200 ++++ cloog-ppl-0.15.10-b/configure 2012-01-27 13:28:49.262987773 +0100 +@@ -11168,7 +11168,7 @@ + fi + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +- LIBS="$LIBS -lppl_c -lppl -lgmpxx" ++ LIBS="-lppl_c -lppl -lgmpxx $LIBS" + + $as_echo "#define CLOOG_PPL_BACKEND 1" >>confdefs.h + +diff -Naurd cloog-ppl-0.15.10-a/configure.in cloog-ppl-0.15.10-b/configure.in +--- cloog-ppl-0.15.10-a/configure.in 2010-08-27 21:13:48.000000000 +0200 ++++ cloog-ppl-0.15.10-b/configure.in 2012-01-27 13:28:49.262987773 +0100 +@@ -343,7 +343,7 @@ + #endif + ], [AC_MSG_RESULT([yes])], [AC_MSG_ERROR(Can't find correct version of PPL.) ]) + +- LIBS="$LIBS -lppl_c -lppl -lgmpxx" ++ LIBS="-lppl_c -lppl -lgmpxx $LIBS" + AC_DEFINE([CLOOG_PPL_BACKEND], 1, [Use the PPL backend]) + + else diff --git a/patches/cloog-ppl/0.15.11/100-add_on_libs_position.patch b/patches/cloog-ppl/0.15.11/100-add_on_libs_position.patch new file mode 100644 index 0000000..21f7213 --- /dev/null +++ b/patches/cloog-ppl/0.15.11/100-add_on_libs_position.patch @@ -0,0 +1,24 @@ +diff -Naurd cloog-ppl-0.15.11-a/configure cloog-ppl-0.15.11-b/configure +--- cloog-ppl-0.15.11-a/configure 2011-04-01 06:22:53.000000000 +0200 ++++ cloog-ppl-0.15.11-b/configure 2012-01-27 13:29:42.698987517 +0100 +@@ -11238,7 +11238,7 @@ + fi + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +- LIBS="$LIBS -lppl_c -lppl -lgmpxx" ++ LIBS="-lppl_c -lppl -lgmpxx $LIBS" + + $as_echo "#define CLOOG_PPL_BACKEND 1" >>confdefs.h + +diff -Naurd cloog-ppl-0.15.11-a/configure.in cloog-ppl-0.15.11-b/configure.in +--- cloog-ppl-0.15.11-a/configure.in 2010-08-27 21:13:48.000000000 +0200 ++++ cloog-ppl-0.15.11-b/configure.in 2012-01-27 13:29:42.698987517 +0100 +@@ -343,7 +343,7 @@ + #endif + ], [AC_MSG_RESULT([yes])], [AC_MSG_ERROR(Can't find correct version of PPL.) ]) + +- LIBS="$LIBS -lppl_c -lppl -lgmpxx" ++ LIBS="-lppl_c -lppl -lgmpxx $LIBS" + AC_DEFINE([CLOOG_PPL_BACKEND], 1, [Use the PPL backend]) + + else diff --git a/patches/cloog-ppl/0.15.6/100-add_on_libs_position.patch b/patches/cloog-ppl/0.15.6/100-add_on_libs_position.patch new file mode 100644 index 0000000..6364292 --- /dev/null +++ b/patches/cloog-ppl/0.15.6/100-add_on_libs_position.patch @@ -0,0 +1,24 @@ +diff -Naurd cloog-ppl-0.15.6-a/configure cloog-ppl-0.15.6-b/configure +--- cloog-ppl-0.15.6-a/configure 2009-08-10 23:18:07.000000000 +0200 ++++ cloog-ppl-0.15.6-b/configure 2012-01-27 13:25:08.858988857 +0100 +@@ -12917,7 +12917,7 @@ + + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +- LIBS="$LIBS -lppl_c -lppl -lgmpxx" ++ LIBS="-lppl_c -lppl -lgmpxx $LIBS" + + cat >>confdefs.h <<\_ACEOF + #define CLOOG_PPL_BACKEND 1 +diff -Naurd cloog-ppl-0.15.6-a/configure.in cloog-ppl-0.15.6-b/configure.in +--- cloog-ppl-0.15.6-a/configure.in 2009-08-10 23:18:07.000000000 +0200 ++++ cloog-ppl-0.15.6-b/configure.in 2012-01-27 13:25:08.862988846 +0100 +@@ -354,7 +354,7 @@ + #endif + ], [AC_MSG_RESULT([yes])], [AC_MSG_ERROR(Can't find correct version of PPL.) ]) + +- LIBS="$LIBS -lppl_c -lppl -lgmpxx" ++ LIBS="-lppl_c -lppl -lgmpxx $LIBS" + AC_DEFINE([CLOOG_PPL_BACKEND], 1, [Use the PPL backend]) + + else diff --git a/patches/cloog-ppl/0.15.7/100-add_on_libs_position.patch b/patches/cloog-ppl/0.15.7/100-add_on_libs_position.patch new file mode 100644 index 0000000..cc37b7d --- /dev/null +++ b/patches/cloog-ppl/0.15.7/100-add_on_libs_position.patch @@ -0,0 +1,24 @@ +diff -Naurd cloog-ppl-0.15.7-a/configure cloog-ppl-0.15.7-b/configure +--- cloog-ppl-0.15.7-a/configure 2009-08-12 03:33:31.000000000 +0200 ++++ cloog-ppl-0.15.7-b/configure 2012-01-27 13:26:13.970988501 +0100 +@@ -12902,7 +12902,7 @@ + + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +- LIBS="$LIBS -lppl_c -lppl -lgmpxx" ++ LIBS="-lppl_c -lppl -lgmpxx $LIBS" + + cat >>confdefs.h <<\_ACEOF + #define CLOOG_PPL_BACKEND 1 +diff -Naurd cloog-ppl-0.15.7-a/configure.in cloog-ppl-0.15.7-b/configure.in +--- cloog-ppl-0.15.7-a/configure.in 2009-08-12 03:33:31.000000000 +0200 ++++ cloog-ppl-0.15.7-b/configure.in 2012-01-27 13:26:13.970988501 +0100 +@@ -345,7 +345,7 @@ + #endif + ], [AC_MSG_RESULT([yes])], [AC_MSG_ERROR(Can't find correct version of PPL.) ]) + +- LIBS="$LIBS -lppl_c -lppl -lgmpxx" ++ LIBS="-lppl_c -lppl -lgmpxx $LIBS" + AC_DEFINE([CLOOG_PPL_BACKEND], 1, [Use the PPL backend]) + + else diff --git a/patches/cloog-ppl/0.15.8/100-add_on_libs_position.patch b/patches/cloog-ppl/0.15.8/100-add_on_libs_position.patch new file mode 100644 index 0000000..4a44bae --- /dev/null +++ b/patches/cloog-ppl/0.15.8/100-add_on_libs_position.patch @@ -0,0 +1,24 @@ +diff -Naurd cloog-ppl-0.15.8-a/configure cloog-ppl-0.15.8-b/configure +--- cloog-ppl-0.15.8-a/configure 2010-02-11 19:05:30.000000000 +0100 ++++ cloog-ppl-0.15.8-b/configure 2012-01-27 13:27:09.710988253 +0100 +@@ -12902,7 +12902,7 @@ + + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +- LIBS="$LIBS -lppl_c -lppl -lgmpxx" ++ LIBS="-lppl_c -lppl -lgmpxx $LIBS" + + cat >>confdefs.h <<\_ACEOF + #define CLOOG_PPL_BACKEND 1 +diff -Naurd cloog-ppl-0.15.8-a/configure.in cloog-ppl-0.15.8-b/configure.in +--- cloog-ppl-0.15.8-a/configure.in 2010-02-11 19:05:31.000000000 +0100 ++++ cloog-ppl-0.15.8-b/configure.in 2012-01-27 13:27:09.710988253 +0100 +@@ -345,7 +345,7 @@ + #endif + ], [AC_MSG_RESULT([yes])], [AC_MSG_ERROR(Can't find correct version of PPL.) ]) + +- LIBS="$LIBS -lppl_c -lppl -lgmpxx" ++ LIBS="-lppl_c -lppl -lgmpxx $LIBS" + AC_DEFINE([CLOOG_PPL_BACKEND], 1, [Use the PPL backend]) + + else diff --git a/patches/cloog-ppl/0.15.9/100-add_on_libs_position.patch b/patches/cloog-ppl/0.15.9/100-add_on_libs_position.patch new file mode 100644 index 0000000..94c4c8b --- /dev/null +++ b/patches/cloog-ppl/0.15.9/100-add_on_libs_position.patch @@ -0,0 +1,24 @@ +diff -Naurd cloog-ppl-0.15.9-a/configure cloog-ppl-0.15.9-b/configure +--- cloog-ppl-0.15.9-a/configure 2010-03-23 22:29:47.000000000 +0100 ++++ cloog-ppl-0.15.9-b/configure 2012-01-27 13:28:03.866987993 +0100 +@@ -12902,7 +12902,7 @@ + + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +- LIBS="$LIBS -lppl_c -lppl -lgmpxx" ++ LIBS="-lppl_c -lppl -lgmpxx $LIBS" + + cat >>confdefs.h <<\_ACEOF + #define CLOOG_PPL_BACKEND 1 +diff -Naurd cloog-ppl-0.15.9-a/configure.in cloog-ppl-0.15.9-b/configure.in +--- cloog-ppl-0.15.9-a/configure.in 2010-03-23 22:29:47.000000000 +0100 ++++ cloog-ppl-0.15.9-b/configure.in 2012-01-27 13:28:03.866987993 +0100 +@@ -345,7 +345,7 @@ + #endif + ], [AC_MSG_RESULT([yes])], [AC_MSG_ERROR(Can't find correct version of PPL.) ]) + +- LIBS="$LIBS -lppl_c -lppl -lgmpxx" ++ LIBS="-lppl_c -lppl -lgmpxx $LIBS" + AC_DEFINE([CLOOG_PPL_BACKEND], 1, [Use the PPL backend]) + + else diff --git a/scripts/build/companion_libs/cloog.sh b/scripts/build/companion_libs/cloog.sh index 4cf6075..2ee0e80 100644 --- a/scripts/build/companion_libs/cloog.sh +++ b/scripts/build/companion_libs/cloog.sh @@ -45,7 +45,7 @@ do_cloog() { CT_DoExecLog CFG \ CFLAGS="${CT_CFLAGS_FOR_HOST}" \ - LDFLAGS="-lm" \ + LIBS="-lm" \ "${cloog_src_dir}/configure" \ --build=${CT_BUILD} \ --host=${CT_HOST} \ -- cgit v0.10.2-6-g49f6