diff options
Diffstat (limited to 'meta/recipes-devtools/libtool/libtool/prefix.patch')
-rw-r--r-- | meta/recipes-devtools/libtool/libtool/prefix.patch | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/meta/recipes-devtools/libtool/libtool/prefix.patch b/meta/recipes-devtools/libtool/libtool/prefix.patch index e6eca1fe02..5e46e68f03 100644 --- a/meta/recipes-devtools/libtool/libtool/prefix.patch +++ b/meta/recipes-devtools/libtool/libtool/prefix.patch | |||
@@ -18,10 +18,10 @@ 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/libltdl/m4/libtool.m4 | 21 | Index: libtool-2.4.2/libltdl/m4/libtool.m4 |
22 | =================================================================== | 22 | =================================================================== |
23 | --- libtool-2.4.orig/libltdl/m4/libtool.m4 | 23 | --- libtool-2.4.2.orig/libltdl/m4/libtool.m4 |
24 | +++ libtool-2.4/libltdl/m4/libtool.m4 | 24 | +++ libtool-2.4.2/libltdl/m4/libtool.m4 |
25 | @@ -94,7 +94,8 @@ _LT_SET_OPTIONS([$0], [$1]) | 25 | @@ -94,7 +94,8 @@ _LT_SET_OPTIONS([$0], [$1]) |
26 | LIBTOOL_DEPS="$ltmain" | 26 | LIBTOOL_DEPS="$ltmain" |
27 | 27 | ||
@@ -32,7 +32,7 @@ Index: libtool-2.4/libltdl/m4/libtool.m4 | |||
32 | AC_SUBST(LIBTOOL)dnl | 32 | AC_SUBST(LIBTOOL)dnl |
33 | 33 | ||
34 | _LT_SETUP | 34 | _LT_SETUP |
35 | @@ -204,7 +205,7 @@ aix3*) | 35 | @@ -206,7 +207,7 @@ aix3*) |
36 | esac | 36 | esac |
37 | 37 | ||
38 | # Global variables: | 38 | # Global variables: |
@@ -41,10 +41,10 @@ Index: libtool-2.4/libltdl/m4/libtool.m4 | |||
41 | can_build_shared=yes | 41 | can_build_shared=yes |
42 | 42 | ||
43 | # All known linkers require a `.a' archive for static linking (except MSVC, | 43 | # All known linkers require a `.a' archive for static linking (except MSVC, |
44 | Index: libtool-2.4/Makefile.am | 44 | Index: libtool-2.4.2/Makefile.am |
45 | =================================================================== | 45 | =================================================================== |
46 | --- libtool-2.4.orig/Makefile.am | 46 | --- libtool-2.4.2.orig/Makefile.am |
47 | +++ libtool-2.4/Makefile.am | 47 | +++ libtool-2.4.2/Makefile.am |
48 | @@ -31,7 +31,7 @@ AM_LDFLAGS = | 48 | @@ -31,7 +31,7 @@ AM_LDFLAGS = |
49 | DIST_SUBDIRS = . | 49 | DIST_SUBDIRS = . |
50 | EXTRA_DIST = | 50 | EXTRA_DIST = |
@@ -54,8 +54,17 @@ Index: libtool-2.4/Makefile.am | |||
54 | 54 | ||
55 | CLEANFILES = | 55 | CLEANFILES = |
56 | MOSTLYCLEANFILES = | 56 | MOSTLYCLEANFILES = |
57 | @@ -65,7 +65,7 @@ rebuild = rebuild=:; $(timestamp); corre | 57 | @@ -72,7 +72,7 @@ EXTRA_DIST += bootstrap $(srcdir)/li |
58 | ## ---------------- ## | 58 | ChangeLog.2002 ChangeLog.2003 ChangeLog.2004 \ |
59 | ChangeLog.2005 ChangeLog.2006 ChangeLog.2007 \ | ||
60 | ChangeLog.2008 ChangeLog.2009 ChangeLog.2010 | ||
61 | -CLEANFILES += libtool libtoolize libtoolize.tmp \ | ||
62 | +CLEANFILES += $(host_alias)-libtool libtoolize libtoolize.tmp \ | ||
63 | $(auxdir)/ltmain.tmp $(m4dir)/ltversion.tmp | ||
64 | |||
65 | ## These are the replacements that need to be made at bootstrap time, | ||
66 | @@ -231,7 +231,7 @@ configure_edit = sed \ | ||
67 | -e 's,@SED\@,$(SED),g' | ||
59 | 68 | ||
60 | # The libtool distributor and the standalone libtool script. | 69 | # The libtool distributor and the standalone libtool script. |
61 | -bin_SCRIPTS = libtoolize libtool | 70 | -bin_SCRIPTS = libtoolize libtool |
@@ -63,7 +72,7 @@ Index: libtool-2.4/Makefile.am | |||
63 | 72 | ||
64 | libtoolize: $(srcdir)/libtoolize.in $(top_builddir)/config.status | 73 | libtoolize: $(srcdir)/libtoolize.in $(top_builddir)/config.status |
65 | rm -f libtoolize.tmp libtoolize | 74 | rm -f libtoolize.tmp libtoolize |
66 | @@ -90,8 +90,8 @@ $(srcdir)/libtoolize.in: $(sh_files) lib | 75 | @@ -244,8 +244,8 @@ libtoolize: $(srcdir)/libtoolize.in $(to |
67 | # We used to do this with a 'stamp-vcl' file, but non-gmake builds | 76 | # We used to do this with a 'stamp-vcl' file, but non-gmake builds |
68 | # would rerun configure on every invocation, so now we manually | 77 | # would rerun configure on every invocation, so now we manually |
69 | # check the version numbers from the build rule when necessary. | 78 | # check the version numbers from the build rule when necessary. |
@@ -74,7 +83,7 @@ Index: libtool-2.4/Makefile.am | |||
74 | if test -f "$$target"; then \ | 83 | if test -f "$$target"; then \ |
75 | set dummy `./$$target --version | sed 1q`; actualver="$$5"; \ | 84 | set dummy `./$$target --version | sed 1q`; actualver="$$5"; \ |
76 | test "$$actualver" = "$$correctver" && rebuild=false; \ | 85 | test "$$actualver" = "$$correctver" && rebuild=false; \ |
77 | @@ -100,8 +100,8 @@ libtool: $(top_builddir)/config.status $ | 86 | @@ -254,8 +254,8 @@ libtool: $(top_builddir)/config.status $ |
78 | case $$prereq in *ChangeLog);; *) rebuild=:;; esac; \ | 87 | case $$prereq in *ChangeLog);; *) rebuild=:;; esac; \ |
79 | done; \ | 88 | done; \ |
80 | if $$rebuild; then \ | 89 | if $$rebuild; then \ |
@@ -85,16 +94,7 @@ Index: libtool-2.4/Makefile.am | |||
85 | fi | 94 | fi |
86 | 95 | ||
87 | .PHONY: configure-subdirs | 96 | .PHONY: configure-subdirs |
88 | @@ -146,7 +146,7 @@ EXTRA_DIST += bootstrap $(srcdir)/li | 97 | @@ -535,12 +535,12 @@ TESTS_ENVIRONMENT = MAKE="$(MAKE)" CC="$ |
89 | ChangeLog.2002 ChangeLog.2003 ChangeLog.2004 \ | ||
90 | ChangeLog.2005 ChangeLog.2006 ChangeLog.2007 \ | ||
91 | ChangeLog.2008 ChangeLog.2009 | ||
92 | -CLEANFILES += libtool libtoolize libtoolize.tmp \ | ||
93 | +CLEANFILES += $(host_alias)-libtool libtoolize libtoolize.tmp \ | ||
94 | $(auxdir)/ltmain.tmp $(m4dir)/ltversion.tmp | ||
95 | |||
96 | ## We build ltversion.m4 here, instead of from config.status, | ||
97 | @@ -526,12 +526,12 @@ TESTS_ENVIRONMENT = MAKE="$(MAKE)" CC="$ | ||
98 | 98 | ||
99 | BUILDCHECK_ENVIRONMENT = _lt_pkgdatadir="$(abs_top_srcdir)" \ | 99 | BUILDCHECK_ENVIRONMENT = _lt_pkgdatadir="$(abs_top_srcdir)" \ |
100 | LIBTOOLIZE="$(abs_top_builddir)/libtoolize" \ | 100 | LIBTOOLIZE="$(abs_top_builddir)/libtoolize" \ |