diff options
Diffstat (limited to 'meta/recipes-devtools/libtool/libtool/prefix.patch')
-rw-r--r-- | meta/recipes-devtools/libtool/libtool/prefix.patch | 111 |
1 files changed, 111 insertions, 0 deletions
diff --git a/meta/recipes-devtools/libtool/libtool/prefix.patch b/meta/recipes-devtools/libtool/libtool/prefix.patch new file mode 100644 index 0000000000..5e46e68f03 --- /dev/null +++ b/meta/recipes-devtools/libtool/libtool/prefix.patch | |||
@@ -0,0 +1,111 @@ | |||
1 | Upstream-Status: Inappropriate [embedded specific] | ||
2 | |||
3 | Renames "libtool" -> "${TARGET_PREFIX}libtool" which makes sure | ||
4 | it can't be confused with the host libtool. | ||
5 | |||
6 | Originally by: RP | ||
7 | |||
8 | Updated: Date: 2010/06/28 | ||
9 | Nitin A Kamble <nitin.a.kamble@intel.com> | ||
10 | |||
11 | It also adjusts libtool so that the header at the script is used for | ||
12 | script execution and not thevalue of $SHELL. This is because many | ||
13 | Makefiles change $SHELL so dash can get used to execute what is | ||
14 | otherwise configured as a bash shell script. Since we don't need to | ||
15 | execute scipts this way on any system I'm aware of us building upon, | ||
16 | the simplest fix is just to remove $SHELL. | ||
17 | |||
18 | Updated: Date: 2011/11/09 | ||
19 | RP | ||
20 | |||
21 | Index: libtool-2.4.2/libltdl/m4/libtool.m4 | ||
22 | =================================================================== | ||
23 | --- libtool-2.4.2.orig/libltdl/m4/libtool.m4 | ||
24 | +++ libtool-2.4.2/libltdl/m4/libtool.m4 | ||
25 | @@ -94,7 +94,8 @@ _LT_SET_OPTIONS([$0], [$1]) | ||
26 | LIBTOOL_DEPS="$ltmain" | ||
27 | |||
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 = | ||
51 | |||
52 | -BUILT_SOURCES = libtool libtoolize | ||
53 | +BUILT_SOURCES = $(host_alias)-libtool libtoolize | ||
54 | |||
55 | CLEANFILES = | ||
56 | MOSTLYCLEANFILES = | ||
57 | @@ -72,7 +72,7 @@ EXTRA_DIST += bootstrap $(srcdir)/li | ||
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' | ||
68 | |||
69 | # The libtool distributor and the standalone libtool script. | ||
70 | -bin_SCRIPTS = libtoolize libtool | ||
71 | +bin_SCRIPTS = libtoolize $(host_alias)-libtool | ||
72 | |||
73 | libtoolize: $(srcdir)/libtoolize.in $(top_builddir)/config.status | ||
74 | rm -f libtoolize.tmp libtoolize | ||
75 | @@ -244,8 +244,8 @@ libtoolize: $(srcdir)/libtoolize.in $(to | ||
76 | # 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 | ||
78 | # check the version numbers from the build rule when necessary. | ||
79 | -libtool: $(top_builddir)/config.status $(srcdir)/$(auxdir)/ltmain.sh ChangeLog | ||
80 | - @target=libtool; $(rebuild); \ | ||
81 | +$(host_alias)-libtool: $(top_builddir)/config.status $(srcdir)/$(auxdir)/ltmain.sh ChangeLog | ||
82 | + @target=$(host_alias)-libtool; $(rebuild); \ | ||
83 | if test -f "$$target"; then \ | ||
84 | set dummy `./$$target --version | sed 1q`; actualver="$$5"; \ | ||
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 | |||
99 | BUILDCHECK_ENVIRONMENT = _lt_pkgdatadir="$(abs_top_srcdir)" \ | ||
100 | LIBTOOLIZE="$(abs_top_builddir)/libtoolize" \ | ||
101 | - LIBTOOL="$(abs_top_builddir)/libtool" \ | ||
102 | + LIBTOOL="$(abs_top_builddir)/$(host_alias)-libtool" \ | ||
103 | tst_aclocaldir="$(abs_top_srcdir)/libltdl/m4" | ||
104 | |||
105 | INSTALLCHECK_ENVIRONMENT = \ | ||
106 | LIBTOOLIZE="$(bindir)/`echo libtoolize | sed '$(program_transform_name)'`" \ | ||
107 | - LIBTOOL="$(bindir)/`echo libtool | sed '$(program_transform_name)'`" \ | ||
108 | + LIBTOOL="$(bindir)/`echo $(host_alias)-libtool | sed '$(program_transform_name)'`" \ | ||
109 | LTDLINCL="-I$(includedir)" \ | ||
110 | LIBLTDL="$(libdir)/libltdl.la" \ | ||
111 | tst_aclocaldir="$(aclocaldir)" | ||