summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorNitin A Kamble <nitin.a.kamble@intel.com>2010-11-08 11:10:56 -0800
committerSaul Wold <Saul.Wold@intel.com>2010-11-18 13:30:25 -0800
commit563953df47785bf57969d86b9b5f8494e585a28c (patch)
tree4b9d4cdb858f08894503dcd5233e6bcf5ed7ab6e /meta/recipes-devtools
parentaa5befab23679e07441805e18d9b6f3f271b5ed5 (diff)
downloadpoky-563953df47785bf57969d86b9b5f8494e585a28c.tar.gz
libtool upgrade from 2.2.10 to 2.4
Taking out of this code from patch as the newer upstream code has fix, and this patch is not needed. cross-compile.patch: -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 Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Diffstat (limited to 'meta/recipes-devtools')
-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.patch27
-rw-r--r--meta/recipes-devtools/libtool/libtool/prefix.patch31
-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 @@
1require libtool_${PV}.bb 1require libtool_${PV}.bb
2 2
3PR = "r1" 3PR = "r0"
4PACKAGES = "" 4PACKAGES = ""
5SRC_URI_append = " file://cross_compile.patch \ 5SRC_URI_append = " file://cross_compile.patch \
6 file://prefix.patch " 6 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
2 2
3DEPENDS = "" 3DEPENDS = ""
4 4
5PR = "r1" 5PR = "r0"
6SRC_URI_append = " file://cross_compile.patch \ 6SRC_URI_append = " file://cross_compile.patch \
7 file://prefix.patch " 7 file://prefix.patch "
8 8
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 @@
1require libtool_${PV}.bb 1require libtool_${PV}.bb
2 2
3PR = "r1" 3PR = "r0"
4SRC_URI_append = " file://cross_compile.patch \ 4SRC_URI_append = " file://cross_compile.patch \
5 file://prefix.patch " 5 file://prefix.patch "
6 6
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.
4 4
5RP - 01/05/2008 5RP - 01/05/2008
6 6
7Index: libtool-2.2.10/libltdl/config/ltmain.m4sh 7Index: libtool-2.4/libltdl/config/ltmain.m4sh
8=================================================================== 8===================================================================
9--- libtool-2.2.10.orig/libltdl/config/ltmain.m4sh 9--- libtool-2.4.orig/libltdl/config/ltmain.m4sh
10+++ libtool-2.2.10/libltdl/config/ltmain.m4sh 10+++ libtool-2.4/libltdl/config/ltmain.m4sh
11@@ -5147,8 +5147,14 @@ func_mode_link () 11@@ -6121,8 +6121,6 @@ func_mode_link ()
12 absdir="$abs_ladir"
13 libdir="$abs_ladir"
14 else
15- dir="$libdir"
16- absdir="$libdir"
17+ # Adding 'libdir' from the .la file to our library search paths
18+ # breaks crosscompilation horribly. We cheat here and don't add
19+ # it, instead adding the path where we found the .la. -CL
20+ dir="$abs_ladir"
21+ absdir="$abs_ladir"
22+ libdir="$abs_ladir"
23+ #dir="$libdir"
24+ #absdir="$libdir"
25 fi
26 test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
27 else
28@@ -5519,8 +5525,6 @@ func_mode_link ()
29 add="$libdir/$linklib" 12 add="$libdir/$linklib"
30 fi 13 fi
31 else 14 else
@@ -34,7 +17,7 @@ Index: libtool-2.2.10/libltdl/config/ltmain.m4sh
34 # Try looking first in the location we're being installed to. 17 # Try looking first in the location we're being installed to.
35 if test -n "$inst_prefix_dir"; then 18 if test -n "$inst_prefix_dir"; then
36 case $libdir in 19 case $libdir in
37@@ -5667,7 +5671,17 @@ func_mode_link () 20@@ -6277,7 +6275,17 @@ func_mode_link ()
38 fi 21 fi
39 ;; 22 ;;
40 *) 23 *)
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
7Nitin A Kamble <nitin.a.kamble@intel.com> 7Nitin A Kamble <nitin.a.kamble@intel.com>
8 8
9 9
10Index: libtool-2.2.10/libltdl/m4/libtool.m4 10Index: libtool-2.4/libltdl/m4/libtool.m4
11=================================================================== 11===================================================================
12--- libtool-2.2.10.orig/libltdl/m4/libtool.m4 12--- libtool-2.4.orig/libltdl/m4/libtool.m4
13+++ libtool-2.2.10/libltdl/m4/libtool.m4 13+++ libtool-2.4/libltdl/m4/libtool.m4
14@@ -94,7 +94,8 @@ _LT_SET_OPTIONS([$0], [$1]) 14@@ -94,7 +94,8 @@ _LT_SET_OPTIONS([$0], [$1])
15 LIBTOOL_DEPS="$ltmain" 15 LIBTOOL_DEPS="$ltmain"
16 16
@@ -21,7 +21,7 @@ Index: libtool-2.2.10/libltdl/m4/libtool.m4
21 AC_SUBST(LIBTOOL)dnl 21 AC_SUBST(LIBTOOL)dnl
22 22
23 _LT_SETUP 23 _LT_SETUP
24@@ -201,7 +202,7 @@ aix3*) 24@@ -204,7 +205,7 @@ aix3*)
25 esac 25 esac
26 26
27 # Global variables: 27 # Global variables:
@@ -30,10 +30,10 @@ Index: libtool-2.2.10/libltdl/m4/libtool.m4
30 can_build_shared=yes 30 can_build_shared=yes
31 31
32 # All known linkers require a `.a' archive for static linking (except MSVC, 32 # All known linkers require a `.a' archive for static linking (except MSVC,
33Index: libtool-2.2.10/Makefile.am 33Index: libtool-2.4/Makefile.am
34=================================================================== 34===================================================================
35--- libtool-2.2.10.orig/Makefile.am 35--- libtool-2.4.orig/Makefile.am
36+++ libtool-2.2.10/Makefile.am 36+++ libtool-2.4/Makefile.am
37@@ -31,7 +31,7 @@ AM_LDFLAGS = 37@@ -31,7 +31,7 @@ AM_LDFLAGS =
38 DIST_SUBDIRS = . 38 DIST_SUBDIRS = .
39 EXTRA_DIST = 39 EXTRA_DIST =
@@ -52,7 +52,7 @@ Index: libtool-2.2.10/Makefile.am
52 52
53 libtoolize: $(srcdir)/libtoolize.in $(top_builddir)/config.status 53 libtoolize: $(srcdir)/libtoolize.in $(top_builddir)/config.status
54 rm -f libtoolize.tmp libtoolize 54 rm -f libtoolize.tmp libtoolize
55@@ -91,8 +91,8 @@ $(srcdir)/libtoolize.in: $(sh_files) lib 55@@ -90,8 +90,8 @@ $(srcdir)/libtoolize.in: $(sh_files) lib
56 # We used to do this with a 'stamp-vcl' file, but non-gmake builds 56 # We used to do this with a 'stamp-vcl' file, but non-gmake builds
57 # would rerun configure on every invocation, so now we manually 57 # would rerun configure on every invocation, so now we manually
58 # check the version numbers from the build rule when necessary. 58 # check the version numbers from the build rule when necessary.
@@ -63,7 +63,7 @@ Index: libtool-2.2.10/Makefile.am
63 if test -f "$$target"; then \ 63 if test -f "$$target"; then \
64 set dummy `./$$target --version | sed 1q`; actualver="$$5"; \ 64 set dummy `./$$target --version | sed 1q`; actualver="$$5"; \
65 test "$$actualver" = "$$correctver" && rebuild=false; \ 65 test "$$actualver" = "$$correctver" && rebuild=false; \
66@@ -101,8 +101,8 @@ libtool: $(top_builddir)/config.status $ 66@@ -100,8 +100,8 @@ libtool: $(top_builddir)/config.status $
67 case $$prereq in *ChangeLog);; *) rebuild=:;; esac; \ 67 case $$prereq in *ChangeLog);; *) rebuild=:;; esac; \
68 done; \ 68 done; \
69 if $$rebuild; then \ 69 if $$rebuild; then \
@@ -74,7 +74,7 @@ Index: libtool-2.2.10/Makefile.am
74 fi 74 fi
75 75
76 .PHONY: configure-subdirs 76 .PHONY: configure-subdirs
77@@ -147,7 +147,7 @@ EXTRA_DIST += bootstrap $(srcdir)/li 77@@ -146,7 +146,7 @@ EXTRA_DIST += bootstrap $(srcdir)/li
78 ChangeLog.2002 ChangeLog.2003 ChangeLog.2004 \ 78 ChangeLog.2002 ChangeLog.2003 ChangeLog.2004 \
79 ChangeLog.2005 ChangeLog.2006 ChangeLog.2007 \ 79 ChangeLog.2005 ChangeLog.2006 ChangeLog.2007 \
80 ChangeLog.2008 ChangeLog.2009 80 ChangeLog.2008 ChangeLog.2009
@@ -83,7 +83,7 @@ Index: libtool-2.2.10/Makefile.am
83 $(auxdir)/ltmain.tmp $(m4dir)/ltversion.tmp 83 $(auxdir)/ltmain.tmp $(m4dir)/ltversion.tmp
84 84
85 ## We build ltversion.m4 here, instead of from config.status, 85 ## We build ltversion.m4 here, instead of from config.status,
86@@ -523,12 +523,12 @@ TESTS_ENVIRONMENT = MAKE="$(MAKE)" CC="$ 86@@ -526,12 +526,12 @@ TESTS_ENVIRONMENT = MAKE="$(MAKE)" CC="$
87 87
88 BUILDCHECK_ENVIRONMENT = _lt_pkgdatadir="$(abs_top_srcdir)" \ 88 BUILDCHECK_ENVIRONMENT = _lt_pkgdatadir="$(abs_top_srcdir)" \
89 LIBTOOLIZE="$(abs_top_builddir)/libtoolize" \ 89 LIBTOOLIZE="$(abs_top_builddir)/libtoolize" \
@@ -98,12 +98,3 @@ Index: libtool-2.2.10/Makefile.am
98 LTDLINCL="-I$(includedir)" \ 98 LTDLINCL="-I$(includedir)" \
99 LIBLTDL="$(libdir)/libltdl.la" \ 99 LIBLTDL="$(libdir)/libltdl.la" \
100 tst_aclocaldir="$(aclocaldir)" 100 tst_aclocaldir="$(aclocaldir)"
101@@ -679,7 +679,7 @@ if HAVE_FC
102 TESTS += $(FC_TESTS)
103 endif
104
105-tests/demo-conf.test: libtool
106+tests/demo-conf.test: $(host_alias)-libtool
107
108 EXTRA_DIST += $(srcdir)/tests/defs.in tests/defs.m4sh \
109 $(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 @@
1require libtool.inc 1require libtool.inc
2DEPENDS = "libtool-native" 2DEPENDS = "libtool-native"
3 3
4PR = "r1" 4PR = "r0"
5 5
6PACKAGES =+ "libltdl libltdl-dev libltdl-dbg" 6PACKAGES =+ "libltdl libltdl-dev libltdl-dbg"
7FILES_${PN} += "${datadir}/aclocal*" 7FILES_${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