patches/mpfr/2.4.1/110-assert.patch
author "Benoît Thébaudeau" <benoit.thebaudeau@advansee.com>
Fri Jan 27 13:31:16 2012 +0100 (2012-01-27)
changeset 2854 a70abdbfa342
permissions -rw-r--r--
complibs/cloog: fix linking with libm

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/<snip>/build/static/lib ./.libs/libcloog.a -lm
/<snip>/build/static/lib/libppl_c.a /<snip>/build/static/lib/libpwl.a
/<snip>/build/static/lib/libppl.a /<snip>/build/static/lib/libgmpxx.a
/<snip>/build/static/lib/libgmp.a -lstdc++
[ALL ] /usr/bin/ld: /<snip>/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" <benoit.thebaudeau@advansee.com>
yann@1249
     1
diff -Naurd mpfr-2.4.1-a/PATCHES mpfr-2.4.1-b/PATCHES
yann@1249
     2
--- mpfr-2.4.1-a/PATCHES	2009-03-04 13:15:05.000000000 +0000
yann@1249
     3
+++ mpfr-2.4.1-b/PATCHES	2009-03-04 13:17:04.000000000 +0000
yann@1249
     4
@@ -0,0 +1 @@
yann@1249
     5
+assert
yann@1249
     6
diff -Naurd mpfr-2.4.1-a/VERSION mpfr-2.4.1-b/VERSION
yann@1249
     7
--- mpfr-2.4.1-a/VERSION	2009-02-27 16:55:37.000000000 +0000
yann@1249
     8
+++ mpfr-2.4.1-b/VERSION	2009-03-04 13:16:46.000000000 +0000
yann@1249
     9
@@ -1 +1 @@
yann@1249
    10
-2.4.1-p1
yann@1249
    11
+2.4.1-p2
yann@1249
    12
diff -Naurd mpfr-2.4.1-a/mpfr-gmp.c mpfr-2.4.1-b/mpfr-gmp.c
yann@1249
    13
--- mpfr-2.4.1-a/mpfr-gmp.c	2009-02-20 09:43:17.000000000 +0000
yann@1249
    14
+++ mpfr-2.4.1-b/mpfr-gmp.c	2009-03-04 13:16:39.000000000 +0000
yann@1249
    15
@@ -301,7 +301,7 @@
yann@1249
    16
       if (linenum != -1)
yann@1249
    17
         fprintf (stderr, "%d: ", linenum);
yann@1249
    18
     }
yann@1249
    19
-  fprintf (stderr, " assertion failed: %s\n", expr);
yann@1249
    20
+  fprintf (stderr, "MPFR assertion failed: %s\n", expr);
yann@1249
    21
   abort();
yann@1249
    22
 }
yann@1249
    23
 
yann@1249
    24
diff -Naurd mpfr-2.4.1-a/mpfr.h mpfr-2.4.1-b/mpfr.h
yann@1249
    25
--- mpfr-2.4.1-a/mpfr.h	2009-02-27 16:55:38.000000000 +0000
yann@1249
    26
+++ mpfr-2.4.1-b/mpfr.h	2009-03-04 13:16:46.000000000 +0000
yann@1249
    27
@@ -27,7 +27,7 @@
yann@1249
    28
 #define MPFR_VERSION_MAJOR 2
yann@1249
    29
 #define MPFR_VERSION_MINOR 4
yann@1249
    30
 #define MPFR_VERSION_PATCHLEVEL 1
yann@1249
    31
-#define MPFR_VERSION_STRING "2.4.1-p1"
yann@1249
    32
+#define MPFR_VERSION_STRING "2.4.1-p2"
yann@1249
    33
 
yann@1249
    34
 /* Macros dealing with MPFR VERSION */
yann@1249
    35
 #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
yann@1249
    36
diff -Naurd mpfr-2.4.1-a/version.c mpfr-2.4.1-b/version.c
yann@1249
    37
--- mpfr-2.4.1-a/version.c	2009-02-27 16:55:38.000000000 +0000
yann@1249
    38
+++ mpfr-2.4.1-b/version.c	2009-03-04 13:16:46.000000000 +0000
yann@1249
    39
@@ -25,5 +25,5 @@
yann@1249
    40
 const char *
yann@1249
    41
 mpfr_get_version (void)
yann@1249
    42
 {
yann@1249
    43
-  return "2.4.1-p1";
yann@1249
    44
+  return "2.4.1-p2";
yann@1249
    45
 }