iproute2: print help in connmark
[openwrt/staging/lynxis/omap.git] / package / network / utils / iproute2 / patches / 210-build-unbreak-linkage-of-m_xt.so.patch
1 From 11e8a1034656eba6571401286b99dabbd9842dac Mon Sep 17 00:00:00 2001
2 From: Jan Engelhardt <jengelh@inai.de>
3 Date: Tue, 18 Dec 2012 09:18:45 -0800
4 Subject: [PATCH] build: unbreak linakge of m_xt.so
5
6 Commit v3.7.0~10 caused the variable new PKG_CONFIG variable never
7 to be present at the time of calling make, leading to tc/m_xt.so
8 not linked with -lxtables (result from pkg-config xtables --libs),
9 that in turn leading to
10
11 tc: symbol lookup error: /usr/lib64/tc//m_xt.so: undefined symbol:
12 xtables_init_all
13
14 Fixing that.
15
16 Signed-off-by: Jan Engelhardt <jengelh@inai.de>
17
18 Conflicts:
19 configure
20 ---
21 configure | 14 +++++++++++---
22 1 file changed, 11 insertions(+), 3 deletions(-)
23
24 --- a/configure
25 +++ b/configure
26 @@ -2,14 +2,20 @@
27 # This is not an autconf generated configure
28 #
29 INCLUDE=${1:-"$PWD/include"}
30 -: ${PKG_CONFIG:=pkg-config}
31 -: ${CC=gcc}
32 -echo "PKG_CONFIG:=${PKG_CONFIG}" >>Config
33
34 # Make a temp directory in build tree.
35 TMPDIR=$(mktemp -d config.XXXXXX)
36 trap 'status=$?; rm -rf $TMPDIR; exit $status' EXIT HUP INT QUIT TERM
37
38 +check_toolchain()
39 +{
40 +: ${PKG_CONFIG:=pkg-config}
41 +: ${AR=ar}
42 +: ${CC=gcc}
43 +echo "AR:=${AR}" >>Config
44 +echo "CC:=${CC}" >>Config
45 +}
46 +
47 check_atm()
48 {
49 cat >$TMPDIR/atmtest.c <<EOF
50 @@ -224,6 +230,8 @@ rm -f $TMPDIR/ipsettest.c $TMPDIR/ipsett
51 }
52
53 echo "# Generated config based on" $INCLUDE >Config
54 +echo "PKG_CONFIG:=${PKG_CONFIG}" >>Config
55 +check_toolchain
56
57 echo "TC schedulers"
58