| 1 |
Author: Laszlo Kajan <[email protected]> |
| 2 |
Description: use hardening flags from environment |
| 3 |
Forwarded: http://lists.alioth.debian.org/pipermail/debian-med-packaging/2012-August/016975.html |
| 4 |
--- a/cif-file/Makefile |
| 5 |
+++ b/cif-file/Makefile |
| 6 |
@@ -141,5 +141,5 @@ $(L_MOD_LIB): $(OBJ_FILES) |
| 7 |
|
| 8 |
# Rule for making object files |
| 9 |
%.o: $(SRC_DIR)/%.C |
| 10 |
- libtool --mode=compile $(CCC) $(C++FLAGS) -c $< -o $(OBJ_DIR)/$@ |
| 11 |
+ libtool --mode=compile $(CCC) $(CPPFLAGS) $(C++FLAGS) -c $< -o $(OBJ_DIR)/$@ |
| 12 |
|
| 13 |
--- a/cif-file-util/Makefile |
| 14 |
+++ b/cif-file-util/Makefile |
| 15 |
@@ -141,5 +141,5 @@ $(L_MOD_LIB): $(OBJ_FILES) |
| 16 |
|
| 17 |
# Rule for making object files |
| 18 |
%.o: $(SRC_DIR)/%.C |
| 19 |
- libtool --mode=compile $(CCC) $(C++FLAGS) -c $< -o $(OBJ_DIR)/$@ |
| 20 |
+ libtool --mode=compile $(CCC) $(CPPFLAGS) $(C++FLAGS) -c $< -o $(OBJ_DIR)/$@ |
| 21 |
|
| 22 |
--- a/cif-parser/Makefile |
| 23 |
+++ b/cif-parser/Makefile |
| 24 |
@@ -181,17 +181,17 @@ obj/%Parser.o $(SRC_DIR)/%Parser.h: $(SR |
| 25 |
sh -c 'cd $(SRC_DIR); $(YACC) $(${^F:.y=_YACC_FLAGS}) ../$<' |
| 26 |
mv $(^:.y=.tab.c) $(^:.y=.c) |
| 27 |
mv $(^:.y=.tab.h) $(^:.y=.h) |
| 28 |
- libtool --mode=compile $(CC) $(CFLAGS_NONANSI) -c $(^:.y=.c) -o obj/$(*)Parser.o |
| 29 |
+ libtool --mode=compile $(CC) $(CPPFLAGS) $(CFLAGS_NONANSI) -c $(^:.y=.c) -o obj/$(*)Parser.o |
| 30 |
|
| 31 |
obj/%Scanner.o: $(SRC_DIR)/%Scanner.l $(OBJ_DIR)/%Parser.o $(SRC_DIR)/%Parser.h |
| 32 |
$(LEX) $($(@F:.o=_LEX_FLAGS)) -t $(SRC_DIR)/$(@F:.o=.l) > $(SRC_DIR)/$(@F:.o=.c) |
| 33 |
- libtool --mode=compile $(CC) $(CFLAGS_NONANSI) -c $(SRC_DIR)/$(@F:.o=.c) -o $(OBJ_DIR)/$(@F) |
| 34 |
+ libtool --mode=compile $(CC) $(CPPFLAGS) $(CFLAGS_NONANSI) -c $(SRC_DIR)/$(@F:.o=.c) -o $(OBJ_DIR)/$(@F) |
| 35 |
|
| 36 |
|
| 37 |
# Rule for making other object files |
| 38 |
obj/%ScannerBase.o: $(SRC_DIR)/%ScannerBase.C $(SRC_DIR)/%Parser.h |
| 39 |
- libtool --mode=compile $(CCC) $(C++FLAGS) -c $< -o $(OBJ_DIR)/$(@F) |
| 40 |
+ libtool --mode=compile $(CCC) $(CPPFLAGS) $(C++FLAGS) -c $< -o $(OBJ_DIR)/$(@F) |
| 41 |
|
| 42 |
obj/%.o: $(SRC_DIR)/%.C |
| 43 |
- libtool --mode=compile $(CCC) $(C++FLAGS) -c $< -o $(OBJ_DIR)/$(@F) |
| 44 |
+ libtool --mode=compile $(CCC) $(CPPFLAGS) $(C++FLAGS) -c $< -o $(OBJ_DIR)/$(@F) |
| 45 |
|
| 46 |
--- a/common/Makefile |
| 47 |
+++ b/common/Makefile |
| 48 |
@@ -153,5 +153,5 @@ $(L_MOD_LIB): $(OBJ_FILES) |
| 49 |
|
| 50 |
# Rule for making object files |
| 51 |
%.o: $(SRC_DIR)/%.C |
| 52 |
- libtool --mode=compile $(CCC) $(C++FLAGS) -c $< -o $(OBJ_DIR)/$@ |
| 53 |
+ libtool --mode=compile $(CCC) $(CPPFLAGS) $(C++FLAGS) -c $< -o $(OBJ_DIR)/$@ |
| 54 |
|
| 55 |
--- a/dict-obj-file/Makefile |
| 56 |
+++ b/dict-obj-file/Makefile |
| 57 |
@@ -142,7 +142,7 @@ clean: clean_build clean_test |
| 58 |
|
| 59 |
# Rule for making executables |
| 60 |
%: $(OBJ_DIR)/%.o $(M_MOD_LIB) $(ALL_DEP_LIBS) |
| 61 |
- $(CCC) $(LDFLAGS) $< $(M_MOD_LIB) $(ALL_DEP_LIBS) $(MALLOCLIB) -lm -o $(L_BIN_DIR)/$@ |
| 62 |
+ $(CCC) $(CPPFLAGS) $(LDFLAGS) $< $(M_MOD_LIB) $(ALL_DEP_LIBS) $(MALLOCLIB) -lm -o $(L_BIN_DIR)/$@ |
| 63 |
@cp -f $(L_BIN_DIR)/$@ $(M_BIN_DIR)/$@ |
| 64 |
|
| 65 |
|
| 66 |
@@ -203,10 +203,10 @@ $(L_MOD_LIB): $(OBJ_OTHER_FILES) |
| 67 |
|
| 68 |
# Rule for making object files |
| 69 |
$(OBJ_DIR)/%.o: $(SRC_DIR)/%.C |
| 70 |
- $(CCC) $(C++FLAGS) -c $< -o $@ |
| 71 |
+ $(CCC) $(CPPFLAGS) $(C++FLAGS) -c $< -o $@ |
| 72 |
|
| 73 |
|
| 74 |
# Phony rule for making object files |
| 75 |
%.o: $(SRC_DIR)/%.C |
| 76 |
- libtool --mode=compile $(CCC) $(C++FLAGS) -c $< -o $(OBJ_DIR)/$@ |
| 77 |
+ libtool --mode=compile $(CCC) $(CPPFLAGS) $(C++FLAGS) -c $< -o $(OBJ_DIR)/$@ |
| 78 |
|
| 79 |
--- a/etc/make.platform.gnu4 |
| 80 |
+++ b/etc/make.platform.gnu4 |
| 81 |
@@ -108,8 +108,8 @@ NON_ANSI_C_FLAG= |
| 82 |
C_WARNINGS=$(WARNINGS) |
| 83 |
|
| 84 |
# C compiler flags |
| 85 |
-CFLAGS=$(OPT) $(ABI) $(PIC) $(ANSI_C_FLAG) $(C_WARNINGS) $(DEFINES) $(INCLUDES) |
| 86 |
-CFLAGS_NONANSI=$(OPT) $(ABI) $(PIC) $(NON_ANSI_C_FLAG) $(DEFINES) $(INCLUDES) |
| 87 |
+CFLAGS_NONANSI := $(CFLAGS) $(OPT) $(ABI) $(PIC) $(NON_ANSI_C_FLAG) $(DEFINES) $(INCLUDES) |
| 88 |
+CFLAGS += $(OPT) $(ABI) $(PIC) $(ANSI_C_FLAG) $(C_WARNINGS) $(DEFINES) $(INCLUDES) |
| 89 |
|
| 90 |
## C++ compiler |
| 91 |
## This part defines C++ compiler information |
| 92 |
@@ -128,14 +128,14 @@ C_PLUS_WARNINGS=$(WARNINGS) $(NO_DEPRECA |
| 93 |
EXT=C |
| 94 |
|
| 95 |
# C++ compiler flags |
| 96 |
-C++FLAGS=$(OPT) $(ABI) $(PIC) $(ANSI_C_PLUS_FLAG) $(C_PLUS_WARNINGS) \ |
| 97 |
+C++FLAGS= $(CXXFLAGS) $(OPT) $(ABI) $(PIC) $(ANSI_C_PLUS_FLAG) $(C_PLUS_WARNINGS) \ |
| 98 |
$(DEFINES) $(INCLUDES) |
| 99 |
-C++FLAGS_NONANSI=$(OPT) $(ABI) $(PIC) $(NON_ANSI_C_PLUS_FLAG) \ |
| 100 |
+C++FLAGS_NONANSI= $(CXXFLAGS) $(OPT) $(ABI) $(PIC) $(NON_ANSI_C_PLUS_FLAG) \ |
| 101 |
$(C_PLUS_WARNINGS) $(DEFINES) $(INCLUDES) |
| 102 |
|
| 103 |
# C++FLAGS_RELAXED should be set to avoid warnings reported by third party |
| 104 |
# source code that is not maintained by PDB |
| 105 |
-C++FLAGS_RELAXED=$(OPT) $(ABI) $(PIC) $(ANSI_C_PLUS_FLAG) $(NO_DEPRECATED) \ |
| 106 |
+C++FLAGS_RELAXED= $(CXXFLAGS) $(OPT) $(ABI) $(PIC) $(ANSI_C_PLUS_FLAG) $(NO_DEPRECATED) \ |
| 107 |
$(DEFINES) $(INCLUDES) |
| 108 |
|
| 109 |
## Fortran compiler |
| 110 |
@@ -158,8 +158,8 @@ F77LIBS= |
| 111 |
STATIC_LINKING=-static |
| 112 |
|
| 113 |
# Linker flags |
| 114 |
-LDFLAGS=$(ABI) -w $(STATIC_LINKING) |
| 115 |
-LDFLAGS_NO_STATIC=$(ABI) -w |
| 116 |
+LDFLAGS_NO_STATIC := $(LDFLAGS) $(ABI) -w |
| 117 |
+LDFLAGS += $(ABI) -w $(STATIC_LINKING) |
| 118 |
|
| 119 |
# Fortran linker |
| 120 |
F77_LINKER=f77 |
| 121 |
--- a/pdbml-parser/Makefile |
| 122 |
+++ b/pdbml-parser/Makefile |
| 123 |
@@ -222,10 +222,10 @@ $(L_MOD_LIB): $(OBJ_OTHER_FILES) |
| 124 |
|
| 125 |
# General rule for making object files |
| 126 |
$(OBJ_DIR)/%.o: $(SRC_DIR)/%.C |
| 127 |
- $(CCC) $(C++FLAGS) -c $< -o $@ |
| 128 |
+ $(CCC) $(CPPFLAGS) $(C++FLAGS) -c $< -o $@ |
| 129 |
|
| 130 |
|
| 131 |
# Phony rule for making object files |
| 132 |
%.o: $(SRC_DIR)/%.C |
| 133 |
- libtool --mode=compile $(CCC) $(C++FLAGS) -c $< -o $(OBJ_DIR)/$@ |
| 134 |
+ libtool --mode=compile $(CCC) $(CPPFLAGS) $(C++FLAGS) -c $< -o $(OBJ_DIR)/$@ |
| 135 |
|
| 136 |
--- a/tables/Makefile |
| 137 |
+++ b/tables/Makefile |
| 138 |
@@ -138,5 +138,5 @@ $(L_MOD_LIB): $(OBJ_FILES) |
| 139 |
|
| 140 |
# Rule for making object files |
| 141 |
%.o: $(SRC_DIR)/%.C |
| 142 |
- libtool --mode=compile $(CCC) $(C++FLAGS) -c $< -o $(OBJ_DIR)/$@ |
| 143 |
+ libtool --mode=compile $(CCC) $(CPPFLAGS) $(C++FLAGS) -c $< -o $(OBJ_DIR)/$@ |
| 144 |
|
| 145 |
--- a/wrapper/Makefile |
| 146 |
+++ b/wrapper/Makefile |
| 147 |
@@ -148,10 +148,10 @@ clean_build: |
| 148 |
$(L_MOD_LIB): $(OBJ_FILES) $(ALL_DEP_LIBS) |
| 149 |
# Create module library |
| 150 |
|
| 151 |
- @cd $(OBJ_DIR); $(CCC) $(LINK_METHOD) $(EXT_LIBS_DIRS) $(OBJ_FILES) $(ALL_DEP_LIBS) $(EXT_LIBS) $(SYS_LIBS) -o ../$@ |
| 152 |
+ @cd $(OBJ_DIR); $(CCC) $(CPPFLAGS) $(LINK_METHOD) $(EXT_LIBS_DIRS) $(OBJ_FILES) $(ALL_DEP_LIBS) $(EXT_LIBS) $(SYS_LIBS) -o ../$@ |
| 153 |
|
| 154 |
|
| 155 |
# Rule for making object files |
| 156 |
%.o: $(SRC_DIR)/%.C |
| 157 |
- $(CCC) $(C++FLAGS) $(EXT_COMP_OPT) -c $< -o $(OBJ_DIR)/$@ |
| 158 |
+ $(CCC) $(CPPFLAGS) $(C++FLAGS) $(EXT_COMP_OPT) -c $< -o $(OBJ_DIR)/$@ |
| 159 |
|
| 160 |
--- a/regex/Makefile |
| 161 |
+++ b/regex/Makefile |
| 162 |
@@ -152,7 +152,7 @@ $(L_MOD_LIB): $(OBJ_FILES) |
| 163 |
|
| 164 |
# Rule for making object files |
| 165 |
%.o: $(SRC_DIR)/%.c |
| 166 |
- libtool --mode=compile $(CC) $(CFLAGS_NONANSI) -DPOSIX_MISTAKE -c $< -o $(OBJ_DIR)/$@ |
| 167 |
+ libtool --mode=compile $(CC) $(CPPFLAGS) $(CFLAGS_NONANSI) -DPOSIX_MISTAKE -c $< -o $(OBJ_DIR)/$@ |
| 168 |
|
| 169 |
|
| 170 |
# Extra, non-used in PDB build |
| 171 |
@@ -180,18 +180,18 @@ TARGET = $(L_BIN_DIR)/re |
| 172 |
|
| 173 |
|
| 174 |
$(OBJ_DIR)/main.o: $(H) $(HEADER_FILES) $(SRC_DIR)/main.c $(L_INCL_DIR)/main.ih |
| 175 |
- $(CC) $(CFLAGS_NONANSI) -DPOSIX_MISTAKE -c $(SRC_DIR)/main.c -o $@ |
| 176 |
+ $(CC) $(CPPFLAGS) $(CFLAGS_NONANSI) -DPOSIX_MISTAKE -c $(SRC_DIR)/main.c -o $@ |
| 177 |
|
| 178 |
$(OBJ_DIR)/split.o: $(H) $(HEADER_FILES) $(SRC_DIR)/split.c |
| 179 |
- libtool --mode=compile $(CC) $(CFLAGS_NONANSI) -DPOSIX_MISTAKE -c $(SRC_DIR)/split.c -o $@ |
| 180 |
+ libtool --mode=compile $(CC) $(CPPFLAGS) $(CFLAGS_NONANSI) -DPOSIX_MISTAKE -c $(SRC_DIR)/split.c -o $@ |
| 181 |
|
| 182 |
debug.o: $(H) $(HEADER_FILES) $(SRC_DIR)/debug.c $(L_INCL_DIR)/debug.ih |
| 183 |
- $(CC) $(CFLAGS_NONANSI) -DPOSIX_MISTAKE -c $(SRC_DIR)/debug.c -o $(OBJ_DIR)/$@ |
| 184 |
+ $(CC) $(CPPFLAGS) $(CFLAGS_NONANSI) -DPOSIX_MISTAKE -c $(SRC_DIR)/debug.c -o $(OBJ_DIR)/$@ |
| 185 |
|
| 186 |
|
| 187 |
# tester |
| 188 |
$(TARGET): $(ALLOBJS) |
| 189 |
- $(CC) $(CFLAGS) -DPOSIX_MISTAKE $(LDFLAGS) $(ALLOBJS) $(LIBS) -o $@ |
| 190 |
+ $(CC) $(CPPFLAGS) $(CFLAGS) -DPOSIX_MISTAKE $(LDFLAGS) $(ALLOBJS) $(LIBS) -o $@ |
| 191 |
|
| 192 |
|
| 193 |
# regression test |