diff options
| author | Phil Sutter <phil@nwl.cc> | 2011-01-19 02:06:32 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-20 14:00:27 +0100 |
| commit | d3c4a628fbee8ccda9c3500a01c7d817adbb9e4d (patch) | |
| tree | 1fa09c83fa6345945bd135e78974f7635d7cc7ec /package/iproute2/patches/patch-configure | |
| parent | cde33531cc2f70323f24127775eacf66364d38c8 (diff) | |
iproute2: fix compiling tc helper libs
First of all, tc may support iptables if available. Dedicate a
sub-package for the libs generated then, so the plain tc package will
always contain the same stuff regardless of whether iptables is there or
not.
Given the right options, iproute2 is indeed able to detect iptables and
libatm, so do that instead of using a shipped Config file.
Patches updated as a nice side effect.
Signed-off-by: Phil Sutter <phil@nwl.cc>
Diffstat (limited to 'package/iproute2/patches/patch-configure')
| -rw-r--r-- | package/iproute2/patches/patch-configure | 59 |
1 files changed, 50 insertions, 9 deletions
diff --git a/package/iproute2/patches/patch-configure b/package/iproute2/patches/patch-configure index 38586090d..a5cf58b45 100644 --- a/package/iproute2/patches/patch-configure +++ b/package/iproute2/patches/patch-configure @@ -1,30 +1,71 @@ - use the compiler passed in $CC ---- iproute2-2.6.29-1.orig/configure 2009-03-24 23:40:54.000000000 +0100 -+++ iproute2-2.6.29-1/configure 2009-08-22 02:23:52.642364236 +0200 -@@ -16,7 +16,7 @@ int main(int argc, char **argv) { + - use the compiler passed in $CC + - predefine iptables modules dir, since the check would + always fail (cause of absolute search paths) and OpenADK + (for now) doesn't compile iptables with shared objects + - do not discard compiler output from tests, they're useful + for debugging + - additionally output the full compiler command before running + it +--- iproute2-2.6.37.orig/configure 2011-01-07 18:54:30.000000000 +0100 ++++ iproute2-2.6.37/configure 2011-01-18 02:37:39.800716449 +0100 +@@ -15,7 +15,8 @@ int main(int argc, char **argv) { return 0; } EOF -gcc -I$INCLUDE -o /tmp/atmtest /tmp/atmtest.c -latm >/dev/null 2>&1 -+$CC -I$INCLUDE -o /tmp/atmtest /tmp/atmtest.c -latm >/dev/null 2>&1 ++echo "$CC -I$INCLUDE -o /tmp/atmtest /tmp/atmtest.c -latm" ++$CC -I$INCLUDE -o /tmp/atmtest /tmp/atmtest.c -latm if [ $? -eq 0 ] then echo "TC_CONFIG_ATM:=y" >>Config -@@ -49,7 +49,7 @@ int main(int argc, char **argv) { +@@ -49,7 +50,8 @@ int main(int argc, char **argv) + + EOF + +-if gcc -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl -lxtables >/dev/null 2>&1 ++echo "$CC -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl -lxtables" ++if $CC -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl -lxtables + then + echo "TC_CONFIG_XT:=y" >>Config + echo "using xtables" +@@ -86,7 +88,8 @@ int main(int argc, char **argv) { } EOF -gcc -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl >/dev/null 2>&1 -+$CC -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl >/dev/null 2>&1 ++echo "$CC -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl" ++$CC -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl if [ $? -eq 0 ] then -@@ -81,7 +81,7 @@ int main(int argc, char **argv) { +@@ -126,7 +129,8 @@ int main(int argc, char **argv) { } EOF -gcc -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl >/dev/null 2>&1 -+$CC -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl >/dev/null 2>&1 ++echo "$CC -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl" ++$CC -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl if [ $? -eq 0 ] then +@@ -149,18 +153,8 @@ check_ipt() + + check_ipt_lib_dir() + { +- IPT_LIB_DIR="" +- for dir in /lib /usr/lib /usr/local/lib +- do +- for file in $dir/$TABLES/lib*t_*so ; do +- if [ -f $file ]; then +- echo $dir/$TABLES +- echo "IPT_LIB_DIR:=$dir/$TABLES" >> Config +- return +- fi +- done +- done +- echo "not found!" ++ echo "/usr/lib/$TABLES" ++ echo "IPT_LIB_DIR:=/usr/lib/$TABLES" >> Config + } + + echo "# Generated config based on" $INCLUDE >Config |