| 1 |
jlec 10/04/19 17:49:24 |
| 2 |
|
| 3 |
Added: mead-2.2.7-respect-flags.patch |
| 4 |
Removed: respect-cflags.patch |
| 5 |
Log: |
| 6 |
resepect LDFLAGS, #316059 |
| 7 |
(Portage version: 2.2_rc67/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 sci-chemistry/mead/files/mead-2.2.7-respect-flags.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/mead/files/mead-2.2.7-respect-flags.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/mead/files/mead-2.2.7-respect-flags.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: mead-2.2.7-respect-flags.patch |
| 16 |
=================================================================== |
| 17 |
diff --git a/apps/Makefile.common.in b/apps/Makefile.common.in |
| 18 |
index 15c61ae..f15d71d 100644 |
| 19 |
--- a/apps/Makefile.common.in |
| 20 |
+++ b/apps/Makefile.common.in |
| 21 |
@@ -36,10 +36,10 @@ REGEX_CPP = @REGEX_CPP@ |
| 22 |
LIBS = @LIBS@ -lm |
| 23 |
|
| 24 |
ALL_CPPFLAGS = -I. $(LOCALINCS) $(CPPFLAGS) $(REGEX_CPP) $(CXX_DEFS) |
| 25 |
-ALL_CXXFLAGS = $(CXX_OPTFLAGS) $(CXX_DEBUGFLAGS) |
| 26 |
-ALL_CFLAGS = $(CC_DEBUGFLAGS) $(CC_OPTFLAGS) |
| 27 |
+ALL_CXXFLAGS = @CXXFLAGS@ |
| 28 |
+ALL_CFLAGS = @CFLAGS@ |
| 29 |
|
| 30 |
-CXXLINK = $(CXX) $(ALL_CPPFLAGS) $(CXX_DEBUGFLAGS) $(CXX_OPTFLAGS) \ |
| 31 |
+CXXLINK = $(CXX) $(ALL_CPPFLAGS) @CXXFLAGS@ \ |
| 32 |
$(LDFLAGS) |
| 33 |
|
| 34 |
.SUFFIXES: .cc .o |
| 35 |
diff --git a/apps/libmso/Makefile.in b/apps/libmso/Makefile.in |
| 36 |
index 249c25b..9d23665 100644 |
| 37 |
--- a/apps/libmso/Makefile.in |
| 38 |
+++ b/apps/libmso/Makefile.in |
| 39 |
@@ -35,8 +35,8 @@ INSTALL = @INSTALL@ |
| 40 |
INSTALL_PROGRAM = @INSTALL_PROGRAM@ |
| 41 |
|
| 42 |
ALL_CPPFLAGS = -I. $(LOCALINCS) $(CPPFLAGS) $(REGEX_CPP) $(CXX_DEFS) |
| 43 |
-ALL_CXXFLAGS = $(CXX_OPTFLAGS) $(CXX_DEBUGFLAGS) |
| 44 |
-ALL_CFLAGS = $(CC_DEBUGFLAGS) $(CC_OPTFLAGS) |
| 45 |
+ALL_CXXFLAGS = @CXXFLAGS@ |
| 46 |
+ALL_CFLAGS = @CFLAGS@ |
| 47 |
|
| 48 |
.SUFFIXES: |
| 49 |
.SUFFIXES: .cc .o |
| 50 |
diff --git a/apps/redti/Makefile.in b/apps/redti/Makefile.in |
| 51 |
index c4aa5ca..9561bf3 100644 |
| 52 |
--- a/apps/redti/Makefile.in |
| 53 |
+++ b/apps/redti/Makefile.in |
| 54 |
@@ -21,7 +21,7 @@ CFLAGS = @CFLAGS@ |
| 55 |
redti_objs = redti.o rfixpro.o rfixprosee.o pfix.o tc.o |
| 56 |
|
| 57 |
redti : $(redti_objs) |
| 58 |
- $(CC) $(CFLAGS) $(redti_objs) -lm -o redti |
| 59 |
+ $(CC) $(CFLAGS) $(LDFLAGS) $(redti_objs) -lm -o redti |
| 60 |
|
| 61 |
appname = redti |
| 62 |
include ../Makefile.common |
| 63 |
diff --git a/libmead/Makefile.in b/libmead/Makefile.in |
| 64 |
index 3d4d5f0..8b4a4ac 100644 |
| 65 |
--- a/libmead/Makefile.in |
| 66 |
+++ b/libmead/Makefile.in |
| 67 |
@@ -99,8 +99,8 @@ PYTHONINC = @PYTHONINC@ |
| 68 |
INCLUDES = -I$(top_srcdir) |
| 69 |
|
| 70 |
ALL_CPPFLAGS = $(INCLUDES) $(CPPFLAGS) $(REGEX_CPP) $(CXX_DEFS) |
| 71 |
-ALL_CXXFLAGS = $(CXX_OPTFLAGS) $(CXX_DEBUGFLAGS) $(CXX_SHAREDFLAGS) |
| 72 |
-ALL_CFLAGS = $(CC_DEBUGFLAGS) $(CC_OPTFLAGS) |
| 73 |
+ALL_CXXFLAGS = @CXXFLAGS@ |
| 74 |
+ALL_CFLAGS = @CFLAGS@ |
| 75 |
|
| 76 |
|
| 77 |
|
| 78 |
diff --git a/swig/Makefile.in b/swig/Makefile.in |
| 79 |
index 81b3b4e..8410307 100644 |
| 80 |
--- a/swig/Makefile.in |
| 81 |
+++ b/swig/Makefile.in |
| 82 |
@@ -58,7 +58,7 @@ CPP_FLAGS = -DSWIG @CPPFLAGS@ |
| 83 |
CXX_FLAGS = @CXX_NOOPTFLAGS@ @CXX_DEBUGFLAGS@ @CXX_SHAREDFLAGS@ |
| 84 |
CXX_DYNLIB_FLAGS = @CXX_DYNLIB_FLAGS@ |
| 85 |
|
| 86 |
-ALL_CXXFLAGS = $(CPP_FLAGS) $(CXX_FLAGS) |
| 87 |
+ALL_CXXFLAGS = $(CPP_FLAGS) @CXXFLAGS@ @CXX_SHAREDFLAGS@ |
| 88 |
|
| 89 |
MEADINC = -I$(top_srcdir) -I$(srcdir) |
| 90 |
MEADLIBS = -L../libmead -lmead |
Archives