diff options
| -rw-r--r-- | meta/recipes-devtools/libtool/libtool-cross_2.4.bb (renamed from meta/recipes-devtools/libtool/libtool-cross_2.2.10.bb) | 2 | ||||
| -rw-r--r-- | meta/recipes-devtools/libtool/libtool-native_2.4.bb (renamed from meta/recipes-devtools/libtool/libtool-native_2.2.10.bb) | 2 | ||||
| -rw-r--r-- | meta/recipes-devtools/libtool/libtool-nativesdk_2.4.bb (renamed from meta/recipes-devtools/libtool/libtool-nativesdk_2.2.10.bb) | 2 | ||||
| -rw-r--r-- | meta/recipes-devtools/libtool/libtool/cross_compile.patch | 27 | ||||
| -rw-r--r-- | meta/recipes-devtools/libtool/libtool/prefix.patch | 31 | ||||
| -rw-r--r-- | meta/recipes-devtools/libtool/libtool_2.4.bb (renamed from meta/recipes-devtools/libtool/libtool_2.2.10.bb) | 2 | ||||
| -rw-r--r-- | meta/recipes-devtools/python/python-scons-native_2.0.1.bb (renamed from meta/recipes-devtools/python/python-scons-native_1.3.0.bb) | 0 | ||||
| -rw-r--r-- | meta/recipes-devtools/python/python-scons_2.0.1.bb (renamed from meta/recipes-devtools/python/python-scons_1.3.0.bb) | 0 |
8 files changed, 20 insertions, 46 deletions
diff --git a/meta/recipes-devtools/libtool/libtool-cross_2.2.10.bb b/meta/recipes-devtools/libtool/libtool-cross_2.4.bb index 23135f7edb..6ea96a5537 100644 --- a/meta/recipes-devtools/libtool/libtool-cross_2.2.10.bb +++ b/meta/recipes-devtools/libtool/libtool-cross_2.4.bb @@ -1,6 +1,6 @@ require libtool_${PV}.bb -PR = "r1" +PR = "r0" PACKAGES = "" SRC_URI_append = " file://cross_compile.patch \ file://prefix.patch " diff --git a/meta/recipes-devtools/libtool/libtool-native_2.2.10.bb b/meta/recipes-devtools/libtool/libtool-native_2.4.bb index 322da4a99b..f10ea8836b 100644 --- a/meta/recipes-devtools/libtool/libtool-native_2.2.10.bb +++ b/meta/recipes-devtools/libtool/libtool-native_2.4.bb @@ -2,7 +2,7 @@ require libtool_${PV}.bb DEPENDS = "" -PR = "r1" +PR = "r0" SRC_URI_append = " file://cross_compile.patch \ file://prefix.patch " diff --git a/meta/recipes-devtools/libtool/libtool-nativesdk_2.2.10.bb b/meta/recipes-devtools/libtool/libtool-nativesdk_2.4.bb index e972d9ef3d..c9f24a95bf 100644 --- a/meta/recipes-devtools/libtool/libtool-nativesdk_2.2.10.bb +++ b/meta/recipes-devtools/libtool/libtool-nativesdk_2.4.bb @@ -1,6 +1,6 @@ require libtool_${PV}.bb -PR = "r1" +PR = "r0" SRC_URI_append = " file://cross_compile.patch \ file://prefix.patch " diff --git a/meta/recipes-devtools/libtool/libtool/cross_compile.patch b/meta/recipes-devtools/libtool/libtool/cross_compile.patch index fc1f4b6fb2..28539ff039 100644 --- a/meta/recipes-devtools/libtool/libtool/cross_compile.patch +++ b/meta/recipes-devtools/libtool/libtool/cross_compile.patch @@ -4,28 +4,11 @@ Not upstreable in this form. RP - 01/05/2008 -Index: libtool-2.2.10/libltdl/config/ltmain.m4sh +Index: libtool-2.4/libltdl/config/ltmain.m4sh =================================================================== ---- libtool-2.2.10.orig/libltdl/config/ltmain.m4sh -+++ libtool-2.2.10/libltdl/config/ltmain.m4sh -@@ -5147,8 +5147,14 @@ func_mode_link () - absdir="$abs_ladir" - libdir="$abs_ladir" - else -- dir="$libdir" -- absdir="$libdir" -+ # Adding 'libdir' from the .la file to our library search paths -+ # breaks crosscompilation horribly. We cheat here and don't add -+ # it, instead adding the path where we found the .la. -CL -+ dir="$abs_ladir" -+ absdir="$abs_ladir" -+ libdir="$abs_ladir" -+ #dir="$libdir" -+ #absdir="$libdir" - fi - test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes - else -@@ -5519,8 +5525,6 @@ func_mode_link () +--- libtool-2.4.orig/libltdl/config/ltmain.m4sh ++++ libtool-2.4/libltdl/config/ltmain.m4sh +@@ -6121,8 +6121,6 @@ func_mode_link () add="$libdir/$linklib" fi else @@ -34,7 +17,7 @@ Index: libtool-2.2.10/libltdl/config/ltmain.m4sh # Try looking first in the location we're being installed to. if test -n "$inst_prefix_dir"; then case $libdir in -@@ -5667,7 +5671,17 @@ func_mode_link () +@@ -6277,7 +6275,17 @@ func_mode_link () fi ;; *) diff --git a/meta/recipes-devtools/libtool/libtool/prefix.patch b/meta/recipes-devtools/libtool/libtool/prefix.patch index d008608a4a..70bbd15461 100644 --- a/meta/recipes-devtools/libtool/libtool/prefix.patch +++ b/meta/recipes-devtools/libtool/libtool/prefix.patch @@ -7,10 +7,10 @@ Updated: Date: 2010/06/28 Nitin A Kamble <nitin.a.kamble@intel.com> -Index: libtool-2.2.10/libltdl/m4/libtool.m4 +Index: libtool-2.4/libltdl/m4/libtool.m4 =================================================================== ---- libtool-2.2.10.orig/libltdl/m4/libtool.m4 -+++ libtool-2.2.10/libltdl/m4/libtool.m4 +--- libtool-2.4.orig/libltdl/m4/libtool.m4 ++++ libtool-2.4/libltdl/m4/libtool.m4 @@ -94,7 +94,8 @@ _LT_SET_OPTIONS([$0], [$1]) LIBTOOL_DEPS="$ltmain" @@ -21,7 +21,7 @@ Index: libtool-2.2.10/libltdl/m4/libtool.m4 AC_SUBST(LIBTOOL)dnl _LT_SETUP -@@ -201,7 +202,7 @@ aix3*) +@@ -204,7 +205,7 @@ aix3*) esac # Global variables: @@ -30,10 +30,10 @@ Index: libtool-2.2.10/libltdl/m4/libtool.m4 can_build_shared=yes # All known linkers require a `.a' archive for static linking (except MSVC, -Index: libtool-2.2.10/Makefile.am +Index: libtool-2.4/Makefile.am =================================================================== ---- libtool-2.2.10.orig/Makefile.am -+++ libtool-2.2.10/Makefile.am +--- libtool-2.4.orig/Makefile.am ++++ libtool-2.4/Makefile.am @@ -31,7 +31,7 @@ AM_LDFLAGS = DIST_SUBDIRS = . EXTRA_DIST = @@ -52,7 +52,7 @@ Index: libtool-2.2.10/Makefile.am libtoolize: $(srcdir)/libtoolize.in $(top_builddir)/config.status rm -f libtoolize.tmp libtoolize -@@ -91,8 +91,8 @@ $(srcdir)/libtoolize.in: $(sh_files) lib +@@ -90,8 +90,8 @@ $(srcdir)/libtoolize.in: $(sh_files) lib # We used to do this with a 'stamp-vcl' file, but non-gmake builds # would rerun configure on every invocation, so now we manually # check the version numbers from the build rule when necessary. @@ -63,7 +63,7 @@ Index: libtool-2.2.10/Makefile.am if test -f "$$target"; then \ set dummy `./$$target --version | sed 1q`; actualver="$$5"; \ test "$$actualver" = "$$correctver" && rebuild=false; \ -@@ -101,8 +101,8 @@ libtool: $(top_builddir)/config.status $ +@@ -100,8 +100,8 @@ libtool: $(top_builddir)/config.status $ case $$prereq in *ChangeLog);; *) rebuild=:;; esac; \ done; \ if $$rebuild; then \ @@ -74,7 +74,7 @@ Index: libtool-2.2.10/Makefile.am fi .PHONY: configure-subdirs -@@ -147,7 +147,7 @@ EXTRA_DIST += bootstrap $(srcdir)/li +@@ -146,7 +146,7 @@ EXTRA_DIST += bootstrap $(srcdir)/li ChangeLog.2002 ChangeLog.2003 ChangeLog.2004 \ ChangeLog.2005 ChangeLog.2006 ChangeLog.2007 \ ChangeLog.2008 ChangeLog.2009 @@ -83,7 +83,7 @@ Index: libtool-2.2.10/Makefile.am $(auxdir)/ltmain.tmp $(m4dir)/ltversion.tmp ## We build ltversion.m4 here, instead of from config.status, -@@ -523,12 +523,12 @@ TESTS_ENVIRONMENT = MAKE="$(MAKE)" CC="$ +@@ -526,12 +526,12 @@ TESTS_ENVIRONMENT = MAKE="$(MAKE)" CC="$ BUILDCHECK_ENVIRONMENT = _lt_pkgdatadir="$(abs_top_srcdir)" \ LIBTOOLIZE="$(abs_top_builddir)/libtoolize" \ @@ -98,12 +98,3 @@ Index: libtool-2.2.10/Makefile.am LTDLINCL="-I$(includedir)" \ LIBLTDL="$(libdir)/libltdl.la" \ tst_aclocaldir="$(aclocaldir)" -@@ -679,7 +679,7 @@ if HAVE_FC - TESTS += $(FC_TESTS) - endif - --tests/demo-conf.test: libtool -+tests/demo-conf.test: $(host_alias)-libtool - - EXTRA_DIST += $(srcdir)/tests/defs.in tests/defs.m4sh \ - $(COMMON_TESTS) $(CXX_TESTS) $(F77_TESTS) $(FC_TESTS) diff --git a/meta/recipes-devtools/libtool/libtool_2.2.10.bb b/meta/recipes-devtools/libtool/libtool_2.4.bb index 9eaec2da67..cca3b1ea4a 100644 --- a/meta/recipes-devtools/libtool/libtool_2.2.10.bb +++ b/meta/recipes-devtools/libtool/libtool_2.4.bb @@ -1,7 +1,7 @@ require libtool.inc DEPENDS = "libtool-native" -PR = "r1" +PR = "r0" PACKAGES =+ "libltdl libltdl-dev libltdl-dbg" FILES_${PN} += "${datadir}/aclocal*" diff --git a/meta/recipes-devtools/python/python-scons-native_1.3.0.bb b/meta/recipes-devtools/python/python-scons-native_2.0.1.bb index a4bcd4258a..a4bcd4258a 100644 --- a/meta/recipes-devtools/python/python-scons-native_1.3.0.bb +++ b/meta/recipes-devtools/python/python-scons-native_2.0.1.bb diff --git a/meta/recipes-devtools/python/python-scons_1.3.0.bb b/meta/recipes-devtools/python/python-scons_2.0.1.bb index f5d11eb925..f5d11eb925 100644 --- a/meta/recipes-devtools/python/python-scons_1.3.0.bb +++ b/meta/recipes-devtools/python/python-scons_2.0.1.bb |