| 1 |
jlec 10/06/24 19:48:35 |
| 2 |
|
| 3 |
Modified: gmt-4.5.0-no-strip.patch |
| 4 |
Log: |
| 5 |
Correct handling of *FLAGS, thanks Martin von Gagern for providing the patch |
| 6 |
(Portage version: 2.2_rc67/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.2 sci-geosciences/gmt/files/gmt-4.5.0-no-strip.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/gmt/files/gmt-4.5.0-no-strip.patch?rev=1.2&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/gmt/files/gmt-4.5.0-no-strip.patch?rev=1.2&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/gmt/files/gmt-4.5.0-no-strip.patch?r1=1.1&r2=1.2 |
| 14 |
|
| 15 |
Index: gmt-4.5.0-no-strip.patch |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/gmt/files/gmt-4.5.0-no-strip.patch,v |
| 18 |
retrieving revision 1.1 |
| 19 |
retrieving revision 1.2 |
| 20 |
diff -u -r1.1 -r1.2 |
| 21 |
--- gmt-4.5.0-no-strip.patch 26 Jul 2009 18:29:55 -0000 1.1 |
| 22 |
+++ gmt-4.5.0-no-strip.patch 24 Jun 2010 19:48:35 -0000 1.2 |
| 23 |
@@ -1,24 +1,62 @@ |
| 24 |
-diff -ur GMT4.5.0.orig/configure GMT4.5.0/configure |
| 25 |
---- GMT4.5.0.orig/configure 2009-07-26 12:11:29.000000000 +0200 |
| 26 |
-+++ GMT4.5.0/configure 2009-07-26 12:14:56.000000000 +0200 |
| 27 |
-@@ -11284,8 +11284,6 @@ |
| 28 |
- CFLAGS=`echo $CFLAGS | sed 's/-g//'` |
| 29 |
- if test "$os" = "Darwin" ; then |
| 30 |
- LDFLAGS="$LDFLAGS -Wl,-x" |
| 31 |
+Drop manipulation of several flags: |
| 32 |
+ |
| 33 |
+* stripping of -g from CFLAGS, as it interferes with deliberate |
| 34 |
+ generation of debug symbols and breaks on flags like -ggdb. |
| 35 |
+* Addition of -s resp. -Wl,-x to LDFLAGS, as stipping of binaries is |
| 36 |
+ done as a separate step on Gentoo (and many other distros) in order |
| 37 |
+ to faciliate retention or splitting of debug symbols. |
| 38 |
+* Setting of optimization flags, as the user should be free to choose |
| 39 |
+ them. |
| 40 |
+ |
| 41 |
+2009-07-27 Martin von Gagern |
| 42 |
+ |
| 43 |
+Reference: http://bugs.gentoo.org/279268 |
| 44 |
+ |
| 45 |
+Index: GMT4.5.0/configure |
| 46 |
+=================================================================== |
| 47 |
+--- GMT4.5.0.orig/configure |
| 48 |
++++ GMT4.5.0/configure |
| 49 |
+@@ -10665,19 +10665,6 @@ if test "X$enable_debug" = "Xyes" ; then |
| 50 |
+ echo "${ECHO_T}yes" >&6; } |
| 51 |
+ CFLAGS="$CFLAGS -g" |
| 52 |
+ else |
| 53 |
+- CFLAGS=`echo $CFLAGS | sed 's/-g//'` |
| 54 |
+- if test "$os" = "Darwin" ; then |
| 55 |
+- LDFLAGS="$LDFLAGS -Wl,-x" |
| 56 |
- else |
| 57 |
- LDFLAGS="$LDFLAGS -s" |
| 58 |
- fi |
| 59 |
- if test "$GCC" = "yes" || test "$os" = "Linux" || test "$os" = "AIX"; then |
| 60 |
- CFLAGS="$CFLAGS -O2" |
| 61 |
-diff -ur GMT4.5.0.orig/configure.ac GMT4.5.0/configure.ac |
| 62 |
---- GMT4.5.0.orig/configure.ac 2009-07-26 12:11:29.000000000 +0200 |
| 63 |
-+++ GMT4.5.0/configure.ac 2009-07-26 12:15:15.000000000 +0200 |
| 64 |
-@@ -530,8 +530,6 @@ |
| 65 |
- CFLAGS=`echo $CFLAGS | sed 's/-g//'` |
| 66 |
- if test "$os" = "Darwin" ; then |
| 67 |
- LDFLAGS="$LDFLAGS -Wl,-x" |
| 68 |
+- fi |
| 69 |
+- if test "$GCC" = "yes" || test "$os" = "Linux" || test "$os" = "AIX"; then |
| 70 |
+- CFLAGS="$CFLAGS -O2" |
| 71 |
+- elif test "$chip" = "alpha" || test "$os" = "AUX" || test "$os" = "HP-UX"; then |
| 72 |
+- CFLAGS="$CFLAGS" |
| 73 |
+- else |
| 74 |
+- CFLAGS="$CFLAGS -O" |
| 75 |
+- fi |
| 76 |
+ { echo "$as_me:$LINENO: result: no" >&5 |
| 77 |
+ echo "${ECHO_T}no" >&6; } |
| 78 |
+ fi |
| 79 |
+Index: GMT4.5.0/configure.ac |
| 80 |
+=================================================================== |
| 81 |
+--- GMT4.5.0.orig/configure.ac |
| 82 |
++++ GMT4.5.0/configure.ac |
| 83 |
+@@ -527,19 +527,6 @@ if test "X$enable_debug" = "Xyes" ; then |
| 84 |
+ AC_MSG_RESULT(yes) |
| 85 |
+ CFLAGS="$CFLAGS -g" |
| 86 |
+ else |
| 87 |
+- CFLAGS=`echo $CFLAGS | sed 's/-g//'` |
| 88 |
+- if test "$os" = "Darwin" ; then |
| 89 |
+- LDFLAGS="$LDFLAGS -Wl,-x" |
| 90 |
- else |
| 91 |
- LDFLAGS="$LDFLAGS -s" |
| 92 |
- fi |
| 93 |
- if test "$GCC" = "yes" || test "$os" = "Linux" || test "$os" = "AIX"; then |
| 94 |
- CFLAGS="$CFLAGS -O2" |
| 95 |
+- fi |
| 96 |
+- if test "$GCC" = "yes" || test "$os" = "Linux" || test "$os" = "AIX"; then |
| 97 |
+- CFLAGS="$CFLAGS -O2" |
| 98 |
+- elif test "$chip" = "alpha" || test "$os" = "AUX" || test "$os" = "HP-UX"; then |
| 99 |
+- CFLAGS="$CFLAGS" |
| 100 |
+- else |
| 101 |
+- CFLAGS="$CFLAGS -O" |
| 102 |
+- fi |
| 103 |
+ AC_MSG_RESULT(no) |
| 104 |
+ fi |
| 105 |
+ dnl ----------------------------------------------------------------- |
Archives