diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2015-01-06 14:47:37 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-01-23 11:36:26 +0000 |
commit | d4e1862453b2a4c12400de0f43f08a9871a4de60 (patch) | |
tree | a79c7e99aec47a61d3d37074e5a335e6d7bd2fd8 /meta/recipes-devtools/libtool/libtool/prefix.patch | |
parent | d97787346347526d163d0de69222bff2e7b25408 (diff) | |
download | poky-d4e1862453b2a4c12400de0f43f08a9871a4de60.tar.gz |
libtool: upgraded to 2.4.4
* Upgrade:
- libtool-native
- libtool-cross
- nativesdk-libtool
- libtool
* Remove 2 patches:
- respect-fstack-protector.patch: already in the new source.
- avoid_absolute_paths_for_general_utils.patch: no general.m4sh any
more.
- Use inline-source to install libtoolize.
* Update other patches
* The LIC_FILES_CHKSUM is changed because of the indent, the contents
are the same.
* The libtool config files are put in libtool/build-aux now, it was
libtool/config in the past.
(From OE-Core rev: 871dc461b1dfc431c0c95743af1624b781262bce)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/libtool/libtool/prefix.patch')
-rw-r--r-- | meta/recipes-devtools/libtool/libtool/prefix.patch | 121 |
1 files changed, 54 insertions, 67 deletions
diff --git a/meta/recipes-devtools/libtool/libtool/prefix.patch b/meta/recipes-devtools/libtool/libtool/prefix.patch index 5e46e68f03..a73df2e4a7 100644 --- a/meta/recipes-devtools/libtool/libtool/prefix.patch +++ b/meta/recipes-devtools/libtool/libtool/prefix.patch | |||
@@ -18,35 +18,13 @@ the simplest fix is just to remove $SHELL. | |||
18 | Updated: Date: 2011/11/09 | 18 | Updated: Date: 2011/11/09 |
19 | RP | 19 | RP |
20 | 20 | ||
21 | Index: libtool-2.4.2/libltdl/m4/libtool.m4 | 21 | Updated by: Robert Yang <liezhi.yang@windriver.com> |
22 | =================================================================== | 22 | |
23 | --- libtool-2.4.2.orig/libltdl/m4/libtool.m4 | 23 | diff --git a/Makefile.am b/Makefile.am |
24 | +++ libtool-2.4.2/libltdl/m4/libtool.m4 | 24 | --- a/Makefile.am |
25 | @@ -94,7 +94,8 @@ _LT_SET_OPTIONS([$0], [$1]) | 25 | +++ b/Makefile.am |
26 | LIBTOOL_DEPS="$ltmain" | 26 | @@ -31,7 +31,7 @@ SUBDIRS = . |
27 | 27 | DIST_SUBDIRS = $(SUBDIRS) | |
28 | # Always use our own libtool. | ||
29 | -LIBTOOL='$(SHELL) $(top_builddir)/libtool' | ||
30 | +LIBTOOL='$(top_builddir)' | ||
31 | +LIBTOOL="$LIBTOOL/${host_alias}-libtool" | ||
32 | AC_SUBST(LIBTOOL)dnl | ||
33 | |||
34 | _LT_SETUP | ||
35 | @@ -206,7 +207,7 @@ aix3*) | ||
36 | esac | ||
37 | |||
38 | # Global variables: | ||
39 | -ofile=libtool | ||
40 | +ofile=${host_alias}-libtool | ||
41 | can_build_shared=yes | ||
42 | |||
43 | # All known linkers require a `.a' archive for static linking (except MSVC, | ||
44 | Index: libtool-2.4.2/Makefile.am | ||
45 | =================================================================== | ||
46 | --- libtool-2.4.2.orig/Makefile.am | ||
47 | +++ libtool-2.4.2/Makefile.am | ||
48 | @@ -31,7 +31,7 @@ AM_LDFLAGS = | ||
49 | DIST_SUBDIRS = . | ||
50 | EXTRA_DIST = | 28 | EXTRA_DIST = |
51 | 29 | ||
52 | -BUILT_SOURCES = libtool libtoolize | 30 | -BUILT_SOURCES = libtool libtoolize |
@@ -54,58 +32,67 @@ Index: libtool-2.4.2/Makefile.am | |||
54 | 32 | ||
55 | CLEANFILES = | 33 | CLEANFILES = |
56 | MOSTLYCLEANFILES = | 34 | MOSTLYCLEANFILES = |
57 | @@ -72,7 +72,7 @@ EXTRA_DIST += bootstrap $(srcdir)/li | 35 | @@ -67,7 +67,7 @@ build_scripts = $(srcdir)/$(aux_dir)/announce-gen \ |
58 | ChangeLog.2002 ChangeLog.2003 ChangeLog.2004 \ | 36 | |
59 | ChangeLog.2005 ChangeLog.2006 ChangeLog.2007 \ | 37 | EXTRA_DIST += bootstrap bootstrap.conf $(build_scripts) cfg.mk maint.mk \ |
60 | ChangeLog.2008 ChangeLog.2009 ChangeLog.2010 | 38 | GNUmakefile |
61 | -CLEANFILES += libtool libtoolize libtoolize.tmp \ | 39 | -CLEANFILES += libtool libtoolize |
62 | +CLEANFILES += $(host_alias)-libtool libtoolize libtoolize.tmp \ | 40 | +CLEANFILES += $(host_alias)-libtool libtoolize |
63 | $(auxdir)/ltmain.tmp $(m4dir)/ltversion.tmp | ||
64 | 41 | ||
65 | ## These are the replacements that need to be made at bootstrap time, | 42 | ## If a file is named several times below, and especially if it |
66 | @@ -231,7 +231,7 @@ configure_edit = sed \ | 43 | ## is a distributed file created during Libtool bootstrap, we |
67 | -e 's,@SED\@,$(SED),g' | 44 | @@ -276,7 +276,7 @@ configure_edit = $(bootstrap_edit) \ |
45 | -e 's|@srcdir\@|$(srcdir)|g' | ||
68 | 46 | ||
69 | # The libtool distributor and the standalone libtool script. | 47 | # The libtool distributor and the standalone libtool script. |
70 | -bin_SCRIPTS = libtoolize libtool | 48 | -bin_SCRIPTS = libtool |
71 | +bin_SCRIPTS = libtoolize $(host_alias)-libtool | 49 | +bin_SCRIPTS = $(host_alias)-libtool |
72 | 50 | ||
73 | libtoolize: $(srcdir)/libtoolize.in $(top_builddir)/config.status | 51 | libtoolize: $(libtoolize_in) $(config_status) |
74 | rm -f libtoolize.tmp libtoolize | 52 | $(AM_V_at)rm -f '$@' |
75 | @@ -244,8 +244,8 @@ libtoolize: $(srcdir)/libtoolize.in $(to | 53 | @@ -287,7 +287,7 @@ libtoolize: $(libtoolize_in) $(config_status) |
76 | # We used to do this with a 'stamp-vcl' file, but non-gmake builds | 54 | # We used to do this with a 'stamp-vcl' file, but non-gmake builds |
77 | # would rerun configure on every invocation, so now we manually | 55 | # would rerun configure on every invocation, so now we manually |
78 | # check the version numbers from the build rule when necessary. | 56 | # check the version numbers from the build rule when necessary. |
79 | -libtool: $(top_builddir)/config.status $(srcdir)/$(auxdir)/ltmain.sh ChangeLog | 57 | -libtool: $(ltmain_sh) $(config_status) $(dotversion) |
80 | - @target=libtool; $(rebuild); \ | 58 | +$(host_alias)-libtool: $(ltmain_sh) $(config_status) $(dotversion) |
81 | +$(host_alias)-libtool: $(top_builddir)/config.status $(srcdir)/$(auxdir)/ltmain.sh ChangeLog | 59 | @$(rebuild); \ |
82 | + @target=$(host_alias)-libtool; $(rebuild); \ | 60 | if test -f '$@'; then \ |
83 | if test -f "$$target"; then \ | 61 | eval `'$(SED)' -n '/^package_revision=/p' '$@'`; \ |
84 | set dummy `./$$target --version | sed 1q`; actualver="$$5"; \ | 62 | @@ -731,12 +731,12 @@ TESTS_ENVIRONMENT = MAKE="$(MAKE)" CC="$(CC)" CFLAGS="$(CFLAGS)" \ |
85 | test "$$actualver" = "$$correctver" && rebuild=false; \ | ||
86 | @@ -254,8 +254,8 @@ libtool: $(top_builddir)/config.status $ | ||
87 | case $$prereq in *ChangeLog);; *) rebuild=:;; esac; \ | ||
88 | done; \ | ||
89 | if $$rebuild; then \ | ||
90 | - echo $(SHELL) ./config.status $$target; \ | ||
91 | - cd $(top_builddir) && $(SHELL) ./config.status $$target; \ | ||
92 | + echo $(SHELL) ./config.status libtool; \ | ||
93 | + cd $(top_builddir) && $(SHELL) ./config.status libtool; \ | ||
94 | fi | ||
95 | |||
96 | .PHONY: configure-subdirs | ||
97 | @@ -535,12 +535,12 @@ TESTS_ENVIRONMENT = MAKE="$(MAKE)" CC="$ | ||
98 | 63 | ||
99 | BUILDCHECK_ENVIRONMENT = _lt_pkgdatadir="$(abs_top_srcdir)" \ | 64 | BUILDCHECK_ENVIRONMENT = _lt_pkgdatadir="$(abs_top_srcdir)" \ |
100 | LIBTOOLIZE="$(abs_top_builddir)/libtoolize" \ | 65 | LIBTOOLIZE="$(abs_top_builddir)/libtoolize" \ |
101 | - LIBTOOL="$(abs_top_builddir)/libtool" \ | 66 | - LIBTOOL="$(abs_top_builddir)/libtool" \ |
102 | + LIBTOOL="$(abs_top_builddir)/$(host_alias)-libtool" \ | 67 | + LIBTOOL="$(abs_top_builddir)/$(host_alias)-libtool" \ |
103 | tst_aclocaldir="$(abs_top_srcdir)/libltdl/m4" | 68 | tst_aclocaldir="$(abs_top_srcdir)/m4" |
104 | 69 | ||
105 | INSTALLCHECK_ENVIRONMENT = \ | 70 | INSTALLCHECK_ENVIRONMENT = \ |
106 | LIBTOOLIZE="$(bindir)/`echo libtoolize | sed '$(program_transform_name)'`" \ | 71 | LIBTOOLIZE="$(bindir)/`echo libtoolize |$(SED) '$(program_transform_name)'`" \ |
107 | - LIBTOOL="$(bindir)/`echo libtool | sed '$(program_transform_name)'`" \ | 72 | - LIBTOOL="$(bindir)/`echo libtool |$(SED) '$(program_transform_name)'`" \ |
108 | + LIBTOOL="$(bindir)/`echo $(host_alias)-libtool | sed '$(program_transform_name)'`" \ | 73 | + LIBTOOL="$(bindir)/`echo $(host_alias)-libtool |$(SED) '$(program_transform_name)'`" \ |
109 | LTDLINCL="-I$(includedir)" \ | 74 | LTDLINCL="-I$(includedir)" \ |
110 | LIBLTDL="$(libdir)/libltdl.la" \ | 75 | LIBLTDL="$(libdir)/libltdl.la" \ |
111 | tst_aclocaldir="$(aclocaldir)" | 76 | tst_aclocaldir="$(aclocaldir)" |
77 | diff --git a/m4/libtool.m4 b/m4/libtool.m4 | ||
78 | --- a/m4/libtool.m4 | ||
79 | +++ b/m4/libtool.m4 | ||
80 | @@ -86,7 +86,8 @@ _LT_SET_OPTIONS([$0], [$1]) | ||
81 | LIBTOOL_DEPS=$ltmain | ||
82 | |||
83 | # Always use our own libtool. | ||
84 | -LIBTOOL='$(SHELL) $(top_builddir)/libtool' | ||
85 | +LIBTOOL='$(top_builddir)' | ||
86 | +LIBTOOL="$LIBTOOL/${host_alias}-libtool" | ||
87 | AC_SUBST(LIBTOOL)dnl | ||
88 | |||
89 | _LT_SETUP | ||
90 | @@ -199,7 +200,7 @@ aix3*) | ||
91 | esac | ||
92 | |||
93 | # Global variables: | ||
94 | -ofile=libtool | ||
95 | +ofile=${host_alias}-libtool | ||
96 | can_build_shared=yes | ||
97 | |||
98 | # All known linkers require a '.a' archive for static linking (except MSVC, | ||