Gitiles
Code Review Sign In
192.168.1.100 / T108 / e958203796650e3959a43708d67534bf36f4c83b / . / external / subpack / net / netsniff-ng / patches / 0001-configure-script-honors-C-LD-FLAGS.patch
blob: 0f9d2e070d6263bf8f9843155587ba5aa1743aaf [file] [log] [blame]
b.liue9582032025-04-17 19:18:16 +0800[diff] [blame^]1From 9da66f0925818ddb12127bfcb46acf79e354cabc Mon Sep 17 00:00:00 2001
2From: Toni Uhlig <matzeton@googlemail.com>
3Date: Mon, 18 May 2020 11:36:56 +0200
4Subject: [PATCH] configure script honors (C|LD)FLAGS
5
6Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
7---
8 configure | 32 ++++++++++++++++----------------
9 1 file changed, 16 insertions(+), 16 deletions(-)
10
11--- a/configure
12+++ b/configure
13@@ -221,8 +221,8 @@ EOF
14 NACL_LIB="nacl"
15 fi
16
17- LDFLAGS="-L $NACL_LIB_DIR"
18- CFLAGS="-I $NACL_INC_DIR"
19+ LDFLAGS="$LDFLAGS -L $NACL_LIB_DIR"
20+ CFLAGS="$CFLAGS -I $NACL_INC_DIR"
21
22 $CC $CFLAGS $LDFLAGS -o $TMPDIR/nacltest $TMPDIR/nacltest.c >> config.log 2>&1
23 if [ ! -x $TMPDIR/nacltest ] ; then
24@@ -268,7 +268,7 @@ int main(void)
25 }
26 EOF
27
28- $CC \
29+ $CC $CFLAGS $LDFLAGS \
30 $($PKG_CONFIG --cflags libnl-3.0 2>> config.log) \
31 $($PKG_CONFIG --cflags libnl-genl-3.0 2>> config.log) \
32 -o $TMPDIR/libnltest \
33@@ -315,7 +315,7 @@ int main(void)
34 }
35 EOF
36
37- $CC \
38+ $CC $CFLAGS $LDFLAGS \
39 $($PKG_CONFIG --cflags libnl-route-3.0 2>> config.log) \
40 -o $TMPDIR/libnlroutetest \
41 $TMPDIR/libnlroutetest.c \
42@@ -350,7 +350,7 @@ int main(void)
43 }
44 EOF
45
46- $CC -o $TMPDIR/tpacketv3test $TMPDIR/tpacketv3test.c >> config.log 2>&1
47+ $CC $CFLAGS $LDFLAGS -o $TMPDIR/tpacketv3test $TMPDIR/tpacketv3test.c >> config.log 2>&1
48 if [ ! -x $TMPDIR/tpacketv3test ] ; then
49 echo "[NO]"
50 MISSING_DEFS=1
51@@ -383,7 +383,7 @@ int main(void)
52 }
53 EOF
54
55- $CC -o $TMPDIR/tpacketv2test $TMPDIR/tpacketv2test.c >> config.log 2>&1
56+ $CC $CFLAGS $LDFLAGS -o $TMPDIR/tpacketv2test $TMPDIR/tpacketv2test.c >> config.log 2>&1
57 if [ ! -x $TMPDIR/tpacketv2test ] ; then
58 echo "[NO]"
59 MISSING_DEFS=1
60@@ -410,7 +410,7 @@ int main(void)
61 }
62 EOF
63
64- $CC -o $TMPDIR/fopencookietest $TMPDIR/fopencookietest.c >> config.log 2>&1
65+ $CC $CFLAGS $LDFLAGS -o $TMPDIR/fopencookietest $TMPDIR/fopencookietest.c >> config.log 2>&1
66 if [ ! -x $TMPDIR/fopencookietest ] ; then
67 echo "[NO]"
68 MISSING_DEFS=1
69@@ -433,7 +433,7 @@ int main(void)
70 }
71 EOF
72
73- $CC \
74+ $CC $CFLAGS $LDFLAGS \
75 $($PKG_CONFIG --cflags ncurses 2>> config.log) \
76 -o $TMPDIR/ncursestest $TMPDIR/ncursestest.c \
77 $($PKG_CONFIG --libs ncurses 2>> config.log \
78@@ -476,7 +476,7 @@ int main(void)
79 }
80 EOF
81
82- $CC -o $TMPDIR/geoiptest $TMPDIR/geoiptest.c -lGeoIP >> config.log 2>&1
83+ $CC $CFLAGS $LDFLAGS -o $TMPDIR/geoiptest $TMPDIR/geoiptest.c -lGeoIP >> config.log 2>&1
84 if [ ! -x $TMPDIR/geoiptest ] ; then
85 echo "[NO]"
86 MISSING_DEFS=1
87@@ -503,7 +503,7 @@ int main(void)
88 }
89 EOF
90
91- $CC \
92+ $CC $CFLAGS $LDFLAGS \
93 $($PKG_CONFIG --cflags libnetfilter_conntrack 2>> config.log) \
94 -o $TMPDIR/nfcttest \
95 $TMPDIR/nfcttest.c \
96@@ -536,7 +536,7 @@ int main(void)
97 }
98 EOF
99
100- $CC -o $TMPDIR/ztest $TMPDIR/ztest.c -lz >> config.log 2>&1
101+ $CC $CFLAGS $LDFLAGS -o $TMPDIR/ztest $TMPDIR/ztest.c -lz >> config.log 2>&1
102 if [ ! -x $TMPDIR/ztest ] ; then
103 echo "[NO]"
104 echo "CONFIG_LIBZ=0" >> Config
105@@ -564,7 +564,7 @@ int main(void)
106 }
107 EOF
108
109- $CC -o $TMPDIR/urcutest $TMPDIR/urcutest.c -lurcu >> config.log 2>&1
110+ $CC $CFLAGS $LDFLAGS -o $TMPDIR/urcutest $TMPDIR/urcutest.c -lurcu >> config.log 2>&1
111 if [ ! -x $TMPDIR/urcutest ] ; then
112 echo "[NO]"
113 MISSING_DEFS=1
114@@ -588,7 +588,7 @@ int main(void)
115 }
116 EOF
117
118- $CC -o $TMPDIR/pcaptest $TMPDIR/pcaptest.c -lpcap >> config.log 2>&1
119+ $CC $CFLAGS $LDFLAGS -o $TMPDIR/pcaptest $TMPDIR/pcaptest.c -lpcap >> config.log 2>&1
120 if [ ! -x $TMPDIR/pcaptest ] ; then
121 echo "[NO]"
122 echo "CONFIG_LIBPCAP=0" >> Config
123@@ -638,7 +638,7 @@ int main(void)
124 }
125 EOF
126
127- $CC -o $TMPDIR/hwtstest $TMPDIR/hwtstest.c >> config.log 2>&1
128+ $CC $CFLAGS $LDFLAGS -o $TMPDIR/hwtstest $TMPDIR/hwtstest.c >> config.log 2>&1
129 if [ ! -x $TMPDIR/hwtstest ] ; then
130 echo "[NO]"
131 echo "CONFIG_HWTSTAMP=0" >> Config
132@@ -663,7 +663,7 @@ int main(void)
133 }
134 EOF
135
136- $CC -o $TMPDIR/clitest $TMPDIR/clitest.c -lcli >> config.log 2>&1
137+ $CC $CFLAGS $LDFLAGS -o $TMPDIR/clitest $TMPDIR/clitest.c -lcli >> config.log 2>&1
138 if [ ! -x $TMPDIR/clitest ] ; then
139 echo "[NO]"
140 MISSING_DEFS=1
141@@ -687,7 +687,7 @@ int main(void)
142 }
143 EOF
144
145- $CC -o $TMPDIR/nettest $TMPDIR/nettest.c -lnet >> config.log 2>&1
146+ $CC $CFLAGS $LDFLAGS -o $TMPDIR/nettest $TMPDIR/nettest.c -lnet >> config.log 2>&1
147 if [ ! -x $TMPDIR/nettest ] ; then
148 echo "[NO]"
149 MISSING_DEFS=1