appneta#140 fixed quick tx cross compile issues

fipn · Oct 10, 2014 · 3933afb · 3933afb
1 parent d505e2e
commit 3933afb
Show file tree

Hide file tree

Showing 17 changed files with 73 additions and 23 deletions.
diff --git a/Makefile.in b/Makefile.in
@@ -117,6 +117,8 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CROSS_ARCH = @CROSS_ARCH@
+CROSS_LD = @CROSS_LD@
 CUT = @CUT@
 CXX = @CXX@
 CXXCPP = @CXXCPP@

diff --git a/configure b/configure
@@ -873,6 +873,8 @@ am__isrc
 INSTALL_DATA
 INSTALL_SCRIPT
 INSTALL_PROGRAM
+CROSS_LD
+CROSS_ARCH
 target_os
 target_vendor
 target_cpu
@@ -3257,6 +3259,15 @@ test -n "$target_alias" &&
 
 
 
+CROSS_ARCH=
+CROSS_LD=
+if test "$cross_compiling" = "yes" ; then
+    CROSS_ARCH="ARCH=$host_cpu"
+    CROSS_LD="LD=$LD"
+fi
+
+
+
 have_cygwin=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cygwin development environment" >&5
 $as_echo_n "checking for cygwin development environment... " >&6; }
@@ -5333,13 +5344,13 @@ if test "${lt_cv_nm_interface+set}" = set; then :
 else
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:5336: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:5347: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:5339: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:5350: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:5342: output\"" >&5)
+  (eval echo "\"\$as_me:5353: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -6545,7 +6556,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 6548 "configure"' > conftest.$ac_ext
+  echo '#line 6559 "configure"' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -8071,11 +8082,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8074: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8085: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:8078: \$? = $ac_status" >&5
+   echo "$as_me:8089: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -8410,11 +8421,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8413: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8424: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:8417: \$? = $ac_status" >&5
+   echo "$as_me:8428: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -8515,11 +8526,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8518: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8529: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:8522: \$? = $ac_status" >&5
+   echo "$as_me:8533: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -8570,11 +8581,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8573: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8584: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:8577: \$? = $ac_status" >&5
+   echo "$as_me:8588: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -10954,7 +10965,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10957 "configure"
+#line 10968 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11050,7 +11061,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11053 "configure"
+#line 11064 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -14355,11 +14366,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14358: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14369: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:14362: \$? = $ac_status" >&5
+   echo "$as_me:14373: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -14454,11 +14465,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14457: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14468: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:14461: \$? = $ac_status" >&5
+   echo "$as_me:14472: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -14506,11 +14517,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14509: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14520: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:14513: \$? = $ac_status" >&5
+   echo "$as_me:14524: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized

diff --git a/configure.ac b/configure.ac
@@ -40,6 +40,15 @@ AC_SUBST(host)
 AC_SUBST(build)
 AC_SUBST(target)
 
+CROSS_ARCH=
+CROSS_LD=
+if test "$cross_compiling" = "yes" ; then
+    CROSS_ARCH="ARCH=$host_cpu"
+    CROSS_LD="LD=$LD"
+fi
+AC_SUBST(CROSS_ARCH)
+AC_SUBST(CROSS_LD)
+
 have_cygwin=no
 AC_MSG_CHECKING([for cygwin development environment])
 if test `echo $target | grep -c cygwin` -gt 0 ; then

diff --git a/docs/Makefile.in b/docs/Makefile.in
@@ -61,6 +61,8 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CROSS_ARCH = @CROSS_ARCH@
+CROSS_LD = @CROSS_LD@
 CUT = @CUT@
 CXX = @CXX@
 CXXCPP = @CXXCPP@

diff --git a/kernel/Makefile.in b/kernel/Makefile.in
@@ -103,6 +103,8 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CROSS_ARCH = @CROSS_ARCH@
+CROSS_LD = @CROSS_LD@
 CUT = @CUT@
 CXX = @CXX@
 CXXCPP = @CXXCPP@

diff --git a/kernel/linux/Makefile.in b/kernel/linux/Makefile.in
@@ -103,6 +103,8 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CROSS_ARCH = @CROSS_ARCH@
+CROSS_LD = @CROSS_LD@
 CUT = @CUT@
 CXX = @CXX@
 CXXCPP = @CXXCPP@

diff --git a/kernel/linux/example/Makefile.in b/kernel/linux/example/Makefile.in
@@ -88,6 +88,8 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CROSS_ARCH = @CROSS_ARCH@
+CROSS_LD = @CROSS_LD@
 CUT = @CUT@
 CXX = @CXX@
 CXXCPP = @CXXCPP@

diff --git a/kernel/linux/quick_tx/Makefile.common b/kernel/linux/quick_tx/Makefile.common
@@ -22,7 +22,8 @@ $(module_DATA): $(automake_dummy_SOURCES)
 	cp $(srcdir)/Makefile.kernel $(srcdir)/Makefile 
 	CPPFLAGS="" CFLAGS="" LDFLAGS="" \
 	$(MAKE) -C $(KERNEL_LOCATION) \
-        CC="gcc" M=$(PWD) modules\
+        $(CROSS_ARCH) CC=$(CC) $(CROSS_LD) \
+        M=$(PWD) modules\
 		KBUILD_VERBOSE=$(KBUILD_VERBOSE) 
 	mv Makefile.automake Makefile 
 
@@ -61,4 +62,4 @@ endif
 
 MOSTLYCLEANFILES = $(module_DATA) .$(module_DATA).flags $(module_DATA:.o=.mod.c) $(module_DATA:.o=.@kernelext@) *~
 
-MAINTAINERCLEANFILES = Makefile.in
+MAINTAINERCLEANFILES = Makefile.in
diff --git a/kernel/linux/quick_tx/Makefile.in b/kernel/linux/quick_tx/Makefile.in
@@ -112,6 +112,8 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CROSS_ARCH = @CROSS_ARCH@
+CROSS_LD = @CROSS_LD@
 CUT = @CUT@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
@@ -581,7 +583,8 @@ $(module_DATA): $(automake_dummy_SOURCES)
 	cp $(srcdir)/Makefile.kernel $(srcdir)/Makefile 
 	CPPFLAGS="" CFLAGS="" LDFLAGS="" \
 	$(MAKE) -C $(KERNEL_LOCATION) \
-        CC="gcc" M=$(PWD) modules\
+        $(CROSS_ARCH) CC=$(CC) $(CROSS_LD) \
+        M=$(PWD) modules\
 		KBUILD_VERBOSE=$(KBUILD_VERBOSE) 
 	mv Makefile.automake Makefile 
 

diff --git a/lib/Makefile.in b/lib/Makefile.in
@@ -88,6 +88,8 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CROSS_ARCH = @CROSS_ARCH@
+CROSS_LD = @CROSS_LD@
 CUT = @CUT@
 CXX = @CXX@
 CXXCPP = @CXXCPP@

diff --git a/libopts/Makefile.in b/libopts/Makefile.in
@@ -108,6 +108,8 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CROSS_ARCH = @CROSS_ARCH@
+CROSS_LD = @CROSS_LD@
 CUT = @CUT@
 CXX = @CXX@
 CXXCPP = @CXXCPP@

diff --git a/scripts/Makefile.in b/scripts/Makefile.in
@@ -61,6 +61,8 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CROSS_ARCH = @CROSS_ARCH@
+CROSS_LD = @CROSS_LD@
 CUT = @CUT@
 CXX = @CXX@
 CXXCPP = @CXXCPP@

diff --git a/src/Makefile.in b/src/Makefile.in
@@ -231,6 +231,8 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CROSS_ARCH = @CROSS_ARCH@
+CROSS_LD = @CROSS_LD@
 CUT = @CUT@
 CXX = @CXX@
 CXXCPP = @CXXCPP@

diff --git a/src/common/Makefile.in b/src/common/Makefile.in
@@ -101,6 +101,8 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CROSS_ARCH = @CROSS_ARCH@
+CROSS_LD = @CROSS_LD@
 CUT = @CUT@
 CXX = @CXX@
 CXXCPP = @CXXCPP@

diff --git a/src/fragroute/Makefile.in b/src/fragroute/Makefile.in
@@ -106,6 +106,8 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CROSS_ARCH = @CROSS_ARCH@
+CROSS_LD = @CROSS_LD@
 CUT = @CUT@
 CXX = @CXX@
 CXXCPP = @CXXCPP@

diff --git a/src/tcpedit/Makefile.in b/src/tcpedit/Makefile.in
@@ -199,6 +199,8 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CROSS_ARCH = @CROSS_ARCH@
+CROSS_LD = @CROSS_LD@
 CUT = @CUT@
 CXX = @CXX@
 CXXCPP = @CXXCPP@

diff --git a/test/Makefile.in b/test/Makefile.in
@@ -62,6 +62,8 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CROSS_ARCH = @CROSS_ARCH@
+CROSS_LD = @CROSS_LD@
 CUT = @CUT@
 CXX = @CXX@
 CXXCPP = @CXXCPP@