diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2010-06-15 07:19:54 -0700 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2010-06-15 07:22:26 -0700 |
| commit | 4dd5818c12c4b6c1efdba5812adcc61d0dcc6ae1 (patch) | |
| tree | 5cd2084936371dae3d7e3c53f33012ac89c3e81e /recipes/iproute2 | |
| parent | 9b54b9315e2507b3fa835449e9a5e8aa31a369ff (diff) | |
| download | openembedded-4dd5818c12c4b6c1efdba5812adcc61d0dcc6ae1.tar.gz | |
iproute2_2.6.34: Make configure to honor cross environment.
* The configure is hand made and it calls gcc directly to poke for
stuff which is not correct when build in cross enviroment so
change gcc calls to $CC and pass the sysroot as a parameter to
search libraries in correct sysroot and not in /usr/lib or /lib
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'recipes/iproute2')
| -rw-r--r-- | recipes/iproute2/iproute2-2.6.34/configure-cross.patch | 58 | ||||
| -rw-r--r-- | recipes/iproute2/iproute2_2.6.34.bb | 12 |
2 files changed, 67 insertions, 3 deletions
diff --git a/recipes/iproute2/iproute2-2.6.34/configure-cross.patch b/recipes/iproute2/iproute2-2.6.34/configure-cross.patch new file mode 100644 index 0000000000..631d6bf958 --- /dev/null +++ b/recipes/iproute2/iproute2-2.6.34/configure-cross.patch @@ -0,0 +1,58 @@ +Index: iproute2-2.6.34/configure +=================================================================== +--- iproute2-2.6.34.orig/configure ++++ iproute2-2.6.34/configure +@@ -4,7 +4,7 @@ + INCLUDE=${1:-"$PWD/include"} + + TABLES= +- ++SYSROOT=$1 + check_atm() + { + cat >/tmp/atmtest.c <<EOF +@@ -15,7 +15,7 @@ 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 + if [ $? -eq 0 ] + then + echo "TC_CONFIG_ATM:=y" >>Config +@@ -49,7 +49,7 @@ 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 ++if $CC -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl -lxtables >/dev/null 2>&1 + then + echo "TC_CONFIG_XT:=y" >>Config + echo "using xtables" +@@ -86,7 +86,7 @@ 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 + + if [ $? -eq 0 ] + then +@@ -126,7 +126,7 @@ 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 + + if [ $? -eq 0 ] + then +@@ -150,7 +150,7 @@ check_ipt() + 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/$TABLES/lib*t_*so ; do + if [ -f $file ]; then diff --git a/recipes/iproute2/iproute2_2.6.34.bb b/recipes/iproute2/iproute2_2.6.34.bb index fb84cb1285..9f8acfe191 100644 --- a/recipes/iproute2/iproute2_2.6.34.bb +++ b/recipes/iproute2/iproute2_2.6.34.bb @@ -1,10 +1,16 @@ require iproute2.inc -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" -SRC_URI = "http://developer.osdl.org/dev/iproute2/download/${P}.tar.bz2" +SRC_URI = "http://developer.osdl.org/dev/iproute2/download/${P}.tar.bz2 \ + file://configure-cross.patch \ + " SRC_URI[md5sum] = "5c5742bdac05a1688f266512e685b83c" SRC_URI[sha256sum] = "f7feb3c34df4714cae0265f7629863af8b0a88550f4f38aba0ffc81a10c29bbb" -S = "${WORKDIR}/iproute2-${PV}"
\ No newline at end of file +S = "${WORKDIR}/iproute2-${PV}" + +do_configure () { + ./configure ${STAGING_DIR_TARGET} +} |