?mode=patch&uid=2010032410344815171

Open Patch: 2010032410344815171 (by stf)

+ stf

Queue: Cross-Build Fixes

Journal: Some updates and cross-compile fixes (discarded)

Votecheck 'core-strong': Missing 1 qualified vote(s) (clifford, fake, teha)

package/base/libtool/libtool.desc

package/base/libtool/libtool.conf

package/base/libtool/parse-config

Stefan Fiedler:
	libtool: build and use cross-compiling libtool in cross-builds 

[Patch History / Archive]

Stefan Fiedler:
	libtool: build and use cross-compiling libtool in cross-builds 

--- package/base/libtool/libtool.desc	(Revision 16)
+++ package/base/libtool/libtool.desc	(Revision 17)
@@ -41,7 +41,7 @@
 [L] GPL
 [S] Stable
 [V] 1.5.22
-[P] X 0-X-4----9 101.550
+[P] X 01X-4----9 101.550
 
 [D] 474263682 libtool-1.5.22.tar.gz ftp://ftp.gnu.org/pub/gnu/libtool/
 
--- package/base/libtool/libtool.conf	(Revision 0)
+++ package/base/libtool/libtool.conf	(Revision 17)
@@ -0,0 +1,13 @@
+	if [ $stagelevel -eq 1 ] ; then
+		# tell libtool to use cross tools. 
+		# we need to remove the version suffix from C and Fortran commands because they
+		# differ from the cross tool names. 
+		# TODO: rename either native or cross tools	
+		var_append configprefix " " "CC=\"$arch_target-${CC/-[0-9][0-9]/}\" CXX=\"$arch_target-${CXX/-[0-9][0-9]/}\" F77=\"$arch_target-${F77/-[0-9][0-9]/}\"
+			STRIP=\"$arch_target-$STRIP\" AR=\"$arch_target-$AR\" LD=\"$arch_target-$LD\" RANLIB=\"$arch_target-$RANLIB\" NM=\"$arch_target-$NM\""
+		var_append makeopt " " "CC=\"$arch_target-${CC/-[0-9][0-9]/}\" CXX=\"$arch_target-${CXX/-[0-9][0-9]/}\" F77=\"$arch_target-${F77/-[0-9][0-9]/}\"
+			STRIP=\"$arch_target-$STRIP\" AR=\"$arch_target-$AR\" LD=\"$arch_target-$LD\" RANLIB=\"$arch_target-$RANLIB\" NM=\"$arch_target-$NM\""
+		var_append makeinstopt " " "CC=\"$arch_target-${CC/-[0-9][0-9]/}\" CXX=\"$arch_target-${CXX/-[0-9][0-9]/}\" F77=\"$arch_target-${F77/-[0-9][0-9]/}\"
+			STRIP=\"$arch_target-$STRIP\" AR=\"$arch_target-$AR\" LD=\"$arch_target-$LD\" RANLIB=\"$arch_target-$RANLIB\" NM=\"$arch_target-$NM\""
+	fi
+
--- package/base/libtool/parse-config	(Revision 16)
+++ package/base/libtool/parse-config	(Revision 17)
@@ -1,3 +1,8 @@
+# point to correct libtool in cross builds
+if [ $stagelevel -lt 3 ] ; then
+	[ -f $root/$tools/bin/libtool ] && export LIBTOOL="$root/$tools/bin/libtool"
+fi
+
 # On cross-builds libtool gets everything, really everything that is
 # possible mess up, messed up - seriously. Just not installing the
 # annoying .la-hell already helps.
@@ -16,3 +21,4 @@
 	var_append flistdel '|' '.*\.la'
 }
 [ $stagelevel -lt 3 ] && hook_add postflist 5 libtool_remove_la
+

[Download this patch]