summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/libtool/libtool/prefix.patch
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2010-08-27 15:14:24 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2010-08-27 15:29:45 +0100
commit29d6678fd546377459ef75cf54abeef5b969b5cf (patch)
tree8edd65790e37a00d01c3f203f773fe4b5012db18 /meta/recipes-devtools/libtool/libtool/prefix.patch
parentda49de6885ee1bc424e70bc02f21f6ab920efb55 (diff)
downloadpoky-29d6678fd546377459ef75cf54abeef5b969b5cf.tar.gz
Major layout change to the packages directory
Having one monolithic packages directory makes it hard to find things and is generally overwhelming. This commit splits it into several logical sections roughly based on function, recipes.txt gives more information about the classifications used. The opportunity is also used to switch from "packages" to "recipes" as used in OpenEmbedded as the term "packages" can be confusing to people and has many different meanings. Not all recipes have been classified yet, this is just a first pass at separating things out. Some packages are moved to meta-extras as they're no longer actively used or maintained. Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/recipes-devtools/libtool/libtool/prefix.patch')
-rw-r--r--meta/recipes-devtools/libtool/libtool/prefix.patch109
1 files changed, 109 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..d008608a4a
--- /dev/null
+++ b/meta/recipes-devtools/libtool/libtool/prefix.patch
@@ -0,0 +1,109 @@
1Renames "libtool" -> "${TARGET_PREFIX}libtool" which makes sure
2it can't be confused with the host libtool.
3
4Originally by: RP
5
6Updated: Date: 2010/06/28
7Nitin A Kamble <nitin.a.kamble@intel.com>
8
9
10Index: libtool-2.2.10/libltdl/m4/libtool.m4
11===================================================================
12--- libtool-2.2.10.orig/libltdl/m4/libtool.m4
13+++ libtool-2.2.10/libltdl/m4/libtool.m4
14@@ -94,7 +94,8 @@ _LT_SET_OPTIONS([$0], [$1])
15 LIBTOOL_DEPS="$ltmain"
16
17 # Always use our own libtool.
18-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
19+LIBTOOL='$(SHELL) $(top_builddir)'
20+LIBTOOL="$LIBTOOL/${host_alias}-libtool"
21 AC_SUBST(LIBTOOL)dnl
22
23 _LT_SETUP
24@@ -201,7 +202,7 @@ aix3*)
25 esac
26
27 # Global variables:
28-ofile=libtool
29+ofile=${host_alias}-libtool
30 can_build_shared=yes
31
32 # All known linkers require a `.a' archive for static linking (except MSVC,
33Index: libtool-2.2.10/Makefile.am
34===================================================================
35--- libtool-2.2.10.orig/Makefile.am
36+++ libtool-2.2.10/Makefile.am
37@@ -31,7 +31,7 @@ AM_LDFLAGS =
38 DIST_SUBDIRS = .
39 EXTRA_DIST =
40
41-BUILT_SOURCES = libtool libtoolize
42+BUILT_SOURCES = $(host_alias)-libtool libtoolize
43
44 CLEANFILES =
45 MOSTLYCLEANFILES =
46@@ -65,7 +65,7 @@ rebuild = rebuild=:; $(timestamp); corre
47 ## ---------------- ##
48
49 # The libtool distributor and the standalone libtool script.
50-bin_SCRIPTS = libtoolize libtool
51+bin_SCRIPTS = libtoolize $(host_alias)-libtool
52
53 libtoolize: $(srcdir)/libtoolize.in $(top_builddir)/config.status
54 rm -f libtoolize.tmp libtoolize
55@@ -91,8 +91,8 @@ $(srcdir)/libtoolize.in: $(sh_files) lib
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
58 # check the version numbers from the build rule when necessary.
59-libtool: $(top_builddir)/config.status $(srcdir)/$(auxdir)/ltmain.sh ChangeLog
60- @target=libtool; $(rebuild); \
61+$(host_alias)-libtool: $(top_builddir)/config.status $(srcdir)/$(auxdir)/ltmain.sh ChangeLog
62+ @target=$(host_alias)-libtool; $(rebuild); \
63 if test -f "$$target"; then \
64 set dummy `./$$target --version | sed 1q`; actualver="$$5"; \
65 test "$$actualver" = "$$correctver" && rebuild=false; \
66@@ -101,8 +101,8 @@ libtool: $(top_builddir)/config.status $
67 case $$prereq in *ChangeLog);; *) rebuild=:;; esac; \
68 done; \
69 if $$rebuild; then \
70- echo $(SHELL) ./config.status $$target; \
71- cd $(top_builddir) && $(SHELL) ./config.status $$target; \
72+ echo $(SHELL) ./config.status libtool; \
73+ cd $(top_builddir) && $(SHELL) ./config.status libtool; \
74 fi
75
76 .PHONY: configure-subdirs
77@@ -147,7 +147,7 @@ EXTRA_DIST += bootstrap $(srcdir)/li
78 ChangeLog.2002 ChangeLog.2003 ChangeLog.2004 \
79 ChangeLog.2005 ChangeLog.2006 ChangeLog.2007 \
80 ChangeLog.2008 ChangeLog.2009
81-CLEANFILES += libtool libtoolize libtoolize.tmp \
82+CLEANFILES += $(host_alias)-libtool libtoolize libtoolize.tmp \
83 $(auxdir)/ltmain.tmp $(m4dir)/ltversion.tmp
84
85 ## We build ltversion.m4 here, instead of from config.status,
86@@ -523,12 +523,12 @@ TESTS_ENVIRONMENT = MAKE="$(MAKE)" CC="$
87
88 BUILDCHECK_ENVIRONMENT = _lt_pkgdatadir="$(abs_top_srcdir)" \
89 LIBTOOLIZE="$(abs_top_builddir)/libtoolize" \
90- LIBTOOL="$(abs_top_builddir)/libtool" \
91+ LIBTOOL="$(abs_top_builddir)/$(host_alias)-libtool" \
92 tst_aclocaldir="$(abs_top_srcdir)/libltdl/m4"
93
94 INSTALLCHECK_ENVIRONMENT = \
95 LIBTOOLIZE="$(bindir)/`echo libtoolize | sed '$(program_transform_name)'`" \
96- LIBTOOL="$(bindir)/`echo libtool | sed '$(program_transform_name)'`" \
97+ LIBTOOL="$(bindir)/`echo $(host_alias)-libtool | sed '$(program_transform_name)'`" \
98 LTDLINCL="-I$(includedir)" \
99 LIBLTDL="$(libdir)/libltdl.la" \
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)