77 lines
2.0 KiB
Diff
77 lines
2.0 KiB
Diff
From 85b0589b4843c03e8e6fd9416d71ea449a73c5c0 Mon Sep 17 00:00:00 2001
|
|
From: Koen Kooi <koen@dominion.thruhere.net>
|
|
Date: Thu, 3 Nov 2011 10:46:16 +0100
|
|
Subject: [PATCH] make configure cross compile safe
|
|
|
|
According to Kevin Tian:
|
|
Upstream-Status: Pending
|
|
|
|
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
|
|
Signed-off-by: Shane Wang <shane.wang@intel.com>
|
|
|
|
diff -r e4e1b14b9c4a configure
|
|
--- a/configure Sun Jan 22 15:26:47 2012 +0800
|
|
+++ b/configure Sun Jan 22 15:29:38 2012 +0800
|
|
@@ -2,6 +2,7 @@
|
|
# This is not an autconf generated configure
|
|
#
|
|
INCLUDE=${1:-"$PWD/include"}
|
|
+SYSROOT=$1
|
|
|
|
check_atm()
|
|
{
|
|
@@ -13,7 +14,7 @@
|
|
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
|
|
if [ $? -eq 0 ]
|
|
then
|
|
echo "TC_CONFIG_ATM:=y" >>Config
|
|
@@ -47,7 +48,7 @@
|
|
|
|
EOF
|
|
|
|
-if gcc -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL $(pkg-config xtables --cflags --libs) -ldl >/dev/null 2>&1
|
|
+if $CC -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL $(pkg-config xtables --cflags --libs) -ldl >/dev/null 2>&1
|
|
then
|
|
echo "TC_CONFIG_XT:=y" >>Config
|
|
echo "using xtables"
|
|
@@ -84,7 +85,7 @@
|
|
}
|
|
|
|
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
|
|
|
|
if [ $? -eq 0 ]
|
|
then
|
|
@@ -124,7 +125,7 @@
|
|
}
|
|
|
|
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
|
|
|
|
if [ $? -eq 0 ]
|
|
then
|
|
@@ -145,7 +146,7 @@
|
|
check_ipt_lib_dir()
|
|
{
|
|
IPT_LIB_DIR=""
|
|
- for dir in /lib /usr/lib /usr/local/lib
|
|
+ for dir in $SYSROOT/lib $SYSROOT/usr/lib $SYSROOT/usr/local/lib
|
|
do
|
|
for file in $dir/{xtables,iptables}/lib*t_*so ; do
|
|
if [ -f $file ]; then
|
|
@@ -168,7 +169,7 @@
|
|
return 0;
|
|
}
|
|
EOF
|
|
-gcc -I$INCLUDE -o /tmp/setnstest /tmp/setnstest.c >/dev/null 2>&1
|
|
+$CC -I$INCLUDE -o /tmp/setnstest /tmp/setnstest.c >/dev/null 2>&1
|
|
if [ $? -eq 0 ]
|
|
then
|
|
echo "IP_CONFIG_SETNS:=y" >>Config
|