1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
|
Description: Add placeholders to CFLAGS and LDFLAGS flags for hardening
Author: Marcos Talau <talau@debian.org>
Last-Update: 2025-02-23
Index: ns-2-sun/Makefile.in
===================================================================
--- ns-2-sun.orig/Makefile.in
+++ ns-2-sun/Makefile.in
@@ -90,6 +90,7 @@ else
endif
+CFLAGS = @CFLAGS@
CFLAGS += $(CCOPT) $(DEFINE)
# Explicitly define compilation rules since SunOS 4's make doesn't like gcc.
Index: ns-2-sun/indep-utils/cmu-scen-gen/setdest/Makefile.in
===================================================================
--- ns-2-sun.orig/indep-utils/cmu-scen-gen/setdest/Makefile.in
+++ ns-2-sun/indep-utils/cmu-scen-gen/setdest/Makefile.in
@@ -54,8 +54,11 @@ MKDEP = ../../../conf/mkdep
# when including files from ns, we need to take care STL_NAMESPACE
DEFINE = -Dstand_alone -DSTL_NAMESPACE=@STL_NAMESPACE@ -DCPP_NAMESPACE=@CPP_NAMESPACE@
-CFLAGS = @V_CCOPT@
-LDFLAGS = @V_STATIC@
+
+CFLAGS = @CFLAGS@
+CFLAGS += @V_CCOPT@
+LDFLAGS = @LDFLAGS@
+LDFLAGS += @V_STATIC@
LIBS = @V_LIB@ -lm @LIBS@
INSTALL = @INSTALL@
@@ -75,7 +78,7 @@ calcdest: rng.o calcdest.o
rng.o:
@rm -f $@
- $(CCX) -c $(DEFINE) -I../../.. -o $@ ../../../tools/rng.cc
+ $(CCX) -c $(DEFINE) $(CFLAGS) -I../../.. -o $@ ../../../tools/rng.cc
setbox: setbox.o
$(CCX) -o setbox $@.o $(LDFLAGS) $(CFLAGS) $(LIBS)
Index: ns-2-sun/indep-utils/webtrace-conv/dec/Makefile.in
===================================================================
--- ns-2-sun.orig/indep-utils/webtrace-conv/dec/Makefile.in
+++ ns-2-sun/indep-utils/webtrace-conv/dec/Makefile.in
@@ -53,8 +53,10 @@ BINDEST = @prefix@/bin
CC = @CXX@
INCLUDE = -I. @V_INCLUDES@
-CFLAGS = @V_CCOPT@ -DCPP_NAMESPACE=@CPP_NAMESPACE@
-LDFLAGS = @V_STATIC@
+CFLAGS = @CFLAGS@
+CFLAGS += @V_CCOPT@ -DCPP_NAMESPACE=@CPP_NAMESPACE@
+LDFLAGS = @LDFLAGS@
+LDFLAGS += @V_STATIC@
LIBS = @V_LIB_TCL@ @V_LIB@ @LIBS@
INSTALL = @INSTALL@
Index: ns-2-sun/indep-utils/webtrace-conv/epa/Makefile.in
===================================================================
--- ns-2-sun.orig/indep-utils/webtrace-conv/epa/Makefile.in
+++ ns-2-sun/indep-utils/webtrace-conv/epa/Makefile.in
@@ -50,8 +50,10 @@ CC = @CXX@
MKDEP = ../../../conf/mkdep
INCLUDE = -I. @V_INCLUDES@
-CFLAGS = @V_CCOPT@ -DCPP_NAMESPACE=@CPP_NAMESPACE@
-LDFLAGS = @V_STATIC@
+CFLAGS = @CFLAGS@
+CFLAGS += @V_CCOPT@ -DCPP_NAMESPACE=@CPP_NAMESPACE@
+LDFLAGS = @LDFLAGS@
+LDFLAGS += @V_STATIC@
LIBS = @V_LIB_TCL@ @V_LIB@ @LIBS@
INSTALL = @INSTALL@
Index: ns-2-sun/indep-utils/webtrace-conv/nlanr/Makefile.in
===================================================================
--- ns-2-sun.orig/indep-utils/webtrace-conv/nlanr/Makefile.in
+++ ns-2-sun/indep-utils/webtrace-conv/nlanr/Makefile.in
@@ -50,8 +50,10 @@ BINDEST = @prefix@/bin
CC = @CXX@
INCLUDE = -I. -I../../.. @V_INCLUDES@
-CFLAGS = @V_CCOPT@ -DCPP_NAMESPACE=@CPP_NAMESPACE@
-LDFLAGS = @V_STATIC@
+CFLAGS = @CFLAGS@
+CFLAGS += @V_CCOPT@ -DCPP_NAMESPACE=@CPP_NAMESPACE@
+LDFLAGS = @LDFLAGS@
+LDFLAGS += @V_STATIC@
LIBS = @V_LIB_TCL@ @V_LIB@ @LIBS@
INSTALL = @INSTALL@
Index: ns-2-sun/indep-utils/webtrace-conv/ucb/Makefile.in
===================================================================
--- ns-2-sun.orig/indep-utils/webtrace-conv/ucb/Makefile.in
+++ ns-2-sun/indep-utils/webtrace-conv/ucb/Makefile.in
@@ -28,8 +28,10 @@ CC = @CXX@
MKDEP = ../../../conf/mkdep
INCLUDE = -I. @V_INCLUDES@
-CFLAGS = @V_CCOPT@ -DCPP_NAMESPACE=@CPP_NAMESPACE@
-LDFLAGS = @V_STATIC@
+CFLAGS = @CFLAGS@
+CFLAGS += @V_CCOPT@ -DCPP_NAMESPACE=@CPP_NAMESPACE@
+LDFLAGS = @LDFLAGS@
+LDFLAGS += @V_STATIC@
LIBS = @V_LIB_TCL@ @V_LIB@ @LIBS@
INSTALL = @INSTALL@
|
