1 |
haubi 11/05/26 09:14:13 |
2 |
|
3 |
Added: 010_all_preserve-cflags.patch |
4 |
Log: |
5 |
moved from ebuild: Stop CFLAGS/CXXFLAGS tweaking in configure |
6 |
|
7 |
Revision Changes Path |
8 |
1.1 src/patchsets/mico/2.3.13/010_all_preserve-cflags.patch |
9 |
|
10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/2.3.13/010_all_preserve-cflags.patch?rev=1.1&view=markup |
11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/2.3.13/010_all_preserve-cflags.patch?rev=1.1&content-type=text/plain |
12 |
|
13 |
Index: 010_all_preserve-cflags.patch |
14 |
=================================================================== |
15 |
Do not tweak CFLAGS/CXXFLAGS for -g/-O2 if not explicitly requested |
16 |
by configure arguments --*able-debug/--*able-optimize. |
17 |
|
18 |
--- configure.in.orig 2011-05-25 16:22:01.402618836 +0200 |
19 |
+++ configure.in 2011-05-25 16:27:35.022640710 +0200 |
20 |
@@ -112,12 +112,12 @@ |
21 |
use_repo=$enableval, use_repo=no) |
22 |
|
23 |
AC_ARG_ENABLE(optimize, |
24 |
- [ --disable-optimize do not use -O2 to compile], |
25 |
- use_opt=$enableval, use_opt=yes) |
26 |
+ [ --enable-optimize use -O2 to compile], |
27 |
+ use_opt=$enableval, use_opt=default) |
28 |
|
29 |
AC_ARG_ENABLE(debug, |
30 |
[ --enable-debug use -g to compile], |
31 |
- use_debug=$enableval, use_debug=no) |
32 |
+ use_debug=$enableval, use_debug=default) |
33 |
|
34 |
AC_ARG_ENABLE(shared, |
35 |
[ --disable-shared don't build shared libs], |
36 |
@@ -976,7 +976,7 @@ |
37 |
CONF_SHARED_CC="$CXX -shared" |
38 |
CONF_PICFLAGS=-fPIC |
39 |
CONF_LDSOFLAGS=-fPIC |
40 |
- if test X"$use_opt" != Xyes; then |
41 |
+ if test X"$use_opt" = Xno; then |
42 |
# by default Intel uses -O so we need to disable it |
43 |
CONF_OPT_FLAGS=-O0 |
44 |
use_opt=yes |
45 |
@@ -1032,17 +1032,23 @@ |
46 |
# |
47 |
|
48 |
changequote(<<, >>) |
49 |
-CXXFLAGS=`echo " $CXXFLAGS " | sed -e 's/ -g / /g' -e 's/ -O[0-9]* / /g'` |
50 |
-CFLAGS=`echo " $CFLAGS " | sed -e 's/ -g / /g' -e 's/ -O[0-9]* / /g'` |
51 |
-changequote([, ]) |
52 |
-if test X"$use_opt" != Xno; then |
53 |
- CXXFLAGS="$CONF_OPT_FLAGS $CXXFLAGS" |
54 |
- CFLAGS="$CONF_OPT_FLAGS $CFLAGS" |
55 |
-fi |
56 |
-if test X"$use_debug" != Xno; then |
57 |
- CXXFLAGS="$CONF_DEBUG_FLAGS $CXXFLAGS" |
58 |
- CFLAGS="$CONF_DEBUG_FLAGS $CFLAGS" |
59 |
+if test X"$use_opt" != Xdefault; then |
60 |
+ CXXFLAGS=`echo " $CXXFLAGS " | sed -e 's/ -O[0-9]* / /g'` |
61 |
+ CFLAGS=`echo " $CFLAGS " | sed -e 's/ -O[0-9]* / /g'` |
62 |
+ if test X"$use_opt" = Xyes; then |
63 |
+ CXXFLAGS="$CONF_OPT_FLAGS $CXXFLAGS" |
64 |
+ CFLAGS="$CONF_OPT_FLAGS $CFLAGS" |
65 |
+ fi |
66 |
fi |
67 |
+if test X"$use_debug" != Xdefault; then |
68 |
+ CXXFLAGS=`echo " $CXXFLAGS " | sed -e 's/ -g / /g'` |
69 |
+ CFLAGS=`echo " $CFLAGS " | sed -e 's/ -g / /g'` |
70 |
+ if test X"$use_debug" = Xyes; then |
71 |
+ CXXFLAGS="$CONF_DEBUG_FLAGS $CXXFLAGS" |
72 |
+ CFLAGS="$CONF_DEBUG_FLAGS $CFLAGS" |
73 |
+ fi |
74 |
+fi |
75 |
+changequote([, ]) |
76 |
|
77 |
if test "x$use_memcheck" = "xyes" ; then |
78 |
case $target in |