summaryrefslogtreecommitdiffstats
path: root/meta/packages/libtool
diff options
context:
space:
mode:
authorNitin A Kamble <nitin.a.kamble@intel.com>2010-06-21 03:46:34 -0700
committerSaul Wold <Saul.Wold@intel.com>2010-07-08 22:05:20 -0700
commitd42466ea43827f1c6a5a972819dac273e381d33d (patch)
tree72c6a9d981257dc2c3fd2173bc56657b20c1061e /meta/packages/libtool
parentf516cfcac0b2d56aebe1da2a00301c669ca77ab9 (diff)
downloadpoky-d42466ea43827f1c6a5a972819dac273e381d33d.tar.gz
libtool family: upgrade from 2.2.6 to 2.2.10
This upgrades these recipes: libtool_2.2.6.bb -> libtool_2.2.10.bb libtool-native_2.2.6.bb -> libtool-native_2.2.10.bb libtool-cross_2.2.6.bb -> libtool-cross_2.2.10.bb libtool-nativesdk_2.2.6.bb -> libtool-nativesdk_2.2.10.bb Also fixes build failure caused by having aclocal.m4 built with older version of libtool. Rebased these patches for the newer version sources add_dolt.patch cross_compile.patch dolt.m4 Changed this patch to fix documentation building for non-x86 archs prefix.patch Rebased and changed to fix the building of ncurses recipe: trailingslash.patch Also updated metadata variables like LICENSE & LIC_CHKSUM_FILES Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Diffstat (limited to 'meta/packages/libtool')
-rw-r--r--meta/packages/libtool/libtool-cross_2.2.10.bb (renamed from meta/packages/libtool/libtool-cross_2.2.6.bb)9
-rw-r--r--meta/packages/libtool/libtool-native_2.2.10.bb (renamed from meta/packages/libtool/libtool-native_2.2.6.bb)7
-rw-r--r--meta/packages/libtool/libtool-nativesdk_2.2.10.bb (renamed from meta/packages/libtool/libtool-nativesdk_2.2.6.bb)11
-rw-r--r--meta/packages/libtool/libtool.inc11
-rw-r--r--meta/packages/libtool/libtool/add_dolt.patch (renamed from meta/packages/libtool/libtool-2.2.6/add_dolt.patch)0
-rw-r--r--meta/packages/libtool/libtool/cross_compile.patch (renamed from meta/packages/libtool/libtool-2.2.6/cross_compile.patch)12
-rw-r--r--meta/packages/libtool/libtool/dolt.m4 (renamed from meta/packages/libtool/libtool-2.2.6/dolt.m4)0
-rw-r--r--meta/packages/libtool/libtool/prefix.patch (renamed from meta/packages/libtool/libtool-2.2.6/prefix.patch)60
-rw-r--r--meta/packages/libtool/libtool/trailingslash.patch (renamed from meta/packages/libtool/libtool-2.2.6/trailingslash.patch)16
-rw-r--r--meta/packages/libtool/libtool_2.2.10.bb (renamed from meta/packages/libtool/libtool_2.2.6.bb)7
10 files changed, 82 insertions, 51 deletions
diff --git a/meta/packages/libtool/libtool-cross_2.2.6.bb b/meta/packages/libtool/libtool-cross_2.2.10.bb
index f081824618..08b27f47be 100644
--- a/meta/packages/libtool/libtool-cross_2.2.6.bb
+++ b/meta/packages/libtool/libtool-cross_2.2.10.bb
@@ -1,15 +1,14 @@
1require libtool_${PV}.bb 1require libtool_${PV}.bb
2 2
3PR = "r31" 3PR = "r0"
4PACKAGES = "" 4PACKAGES = ""
5SRC_URI_append = " file://cross_compile.patch;patch=1 \ 5SRC_URI_append = " file://cross_compile.patch "
6 file://prefix.patch;patch=1"
7 6
8DEPENDS += "libtool-native" 7DEPENDS += "libtool-native"
9 8
10DOLT_PATCH = "" 9DOLT_PATCH = ""
11DOLT_PATCH_arm = " file://add_dolt.patch;patch=1" 10DOLT_PATCH_arm = " file://add_dolt.patch"
12DOLT_PATCH_i586 = " file://add_dolt.patch;patch=1" 11DOLT_PATCH_i586 = " file://add_dolt.patch"
13 12
14#SRC_URI_append_linux = "${DOLT_PATCH}" 13#SRC_URI_append_linux = "${DOLT_PATCH}"
15#SRC_URI_append_linux-gnueabi = "${DOLT_PATCH}" 14#SRC_URI_append_linux-gnueabi = "${DOLT_PATCH}"
diff --git a/meta/packages/libtool/libtool-native_2.2.6.bb b/meta/packages/libtool/libtool-native_2.2.10.bb
index c5827ffb48..5af5d7b94a 100644
--- a/meta/packages/libtool/libtool-native_2.2.6.bb
+++ b/meta/packages/libtool/libtool-native_2.2.10.bb
@@ -1,8 +1,9 @@
1require libtool_${PV}.bb 1require libtool_${PV}.bb
2 2
3PR = "r23" 3DEPENDS = ""
4SRC_URI_append = " file://cross_compile.patch;patch=1 \ 4
5 file://prefix.patch;patch=1" 5PR = "r0"
6SRC_URI_append = " file://cross_compile.patch "
6 7
7inherit native 8inherit native
8 9
diff --git a/meta/packages/libtool/libtool-nativesdk_2.2.6.bb b/meta/packages/libtool/libtool-nativesdk_2.2.10.bb
index 77acbd5854..05444c7cce 100644
--- a/meta/packages/libtool/libtool-nativesdk_2.2.6.bb
+++ b/meta/packages/libtool/libtool-nativesdk_2.2.10.bb
@@ -1,10 +1,17 @@
1require libtool_${PV}.bb 1require libtool_${PV}.bb
2 2
3PR = "r4" 3PR = "r0"
4SRC_URI_append = " file://cross_compile.patch;patch=1" 4SRC_URI_append = " file://cross_compile.patch"
5 5
6inherit nativesdk 6inherit nativesdk
7 7
8do_configure_prepend () {
9 # Remove any existing libtool m4 since old stale versions would break
10 # any upgrade
11 rm -f ${STAGING_DATADIR}/aclocal/libtool.m4
12 rm -f ${STAGING_DATADIR}/aclocal/lt*.m4
13}
14
8do_install () { 15do_install () {
9 autotools_do_install 16 autotools_do_install
10 install -d ${D}${bindir}/ 17 install -d ${D}${bindir}/
diff --git a/meta/packages/libtool/libtool.inc b/meta/packages/libtool/libtool.inc
index db86d15ba4..81c3eaf6d9 100644
--- a/meta/packages/libtool/libtool.inc
+++ b/meta/packages/libtool/libtool.inc
@@ -3,6 +3,15 @@ This is GNU libtool, a generic library support script. Libtool hides \
3the complexity of generating special library types (such as shared \ 3the complexity of generating special library types (such as shared \
4libraries) behind a consistent interface." 4libraries) behind a consistent interface."
5HOMEPAGE = "http://www.gnu.org/software/libtool/libtool.html" 5HOMEPAGE = "http://www.gnu.org/software/libtool/libtool.html"
6LICENSE = "GPL"
7SECTION = "devel" 6SECTION = "devel"
7LICENSE = "GPLv2, LGPLv2.1"
8LIC_FILES_CHKSUM = " \
9 file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
10 file://libltdl/COPYING.LIB;md5=e3eda01d9815f8d24aae2dbd89b68b06 \
11 "
12
13SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \
14 file://trailingslash.patch \
15 file://prefix.patch \
16 file://dolt.m4 "
8 17
diff --git a/meta/packages/libtool/libtool-2.2.6/add_dolt.patch b/meta/packages/libtool/libtool/add_dolt.patch
index 2c5df96031..2c5df96031 100644
--- a/meta/packages/libtool/libtool-2.2.6/add_dolt.patch
+++ b/meta/packages/libtool/libtool/add_dolt.patch
diff --git a/meta/packages/libtool/libtool-2.2.6/cross_compile.patch b/meta/packages/libtool/libtool/cross_compile.patch
index b4bacbd12f..fc1f4b6fb2 100644
--- a/meta/packages/libtool/libtool-2.2.6/cross_compile.patch
+++ b/meta/packages/libtool/libtool/cross_compile.patch
@@ -4,11 +4,11 @@ Not upstreable in this form.
4 4
5RP - 01/05/2008 5RP - 01/05/2008
6 6
7Index: libtool-2.2.2/libltdl/config/ltmain.m4sh 7Index: libtool-2.2.10/libltdl/config/ltmain.m4sh
8=================================================================== 8===================================================================
9--- libtool-2.2.2.orig/libltdl/config/ltmain.m4sh 2008-05-01 21:48:42.000000000 +0100 9--- libtool-2.2.10.orig/libltdl/config/ltmain.m4sh
10+++ libtool-2.2.2/libltdl/config/ltmain.m4sh 2008-05-01 21:51:41.000000000 +0100 10+++ libtool-2.2.10/libltdl/config/ltmain.m4sh
11@@ -4454,8 +4454,14 @@ 11@@ -5147,8 +5147,14 @@ func_mode_link ()
12 absdir="$abs_ladir" 12 absdir="$abs_ladir"
13 libdir="$abs_ladir" 13 libdir="$abs_ladir"
14 else 14 else
@@ -25,7 +25,7 @@ Index: libtool-2.2.2/libltdl/config/ltmain.m4sh
25 fi 25 fi
26 test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes 26 test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
27 else 27 else
28@@ -4825,8 +4831,6 @@ 28@@ -5519,8 +5525,6 @@ func_mode_link ()
29 add="$libdir/$linklib" 29 add="$libdir/$linklib"
30 fi 30 fi
31 else 31 else
@@ -34,7 +34,7 @@ Index: libtool-2.2.2/libltdl/config/ltmain.m4sh
34 # Try looking first in the location we're being installed to. 34 # Try looking first in the location we're being installed to.
35 if test -n "$inst_prefix_dir"; then 35 if test -n "$inst_prefix_dir"; then
36 case $libdir in 36 case $libdir in
37@@ -4972,7 +4976,17 @@ 37@@ -5667,7 +5671,17 @@ func_mode_link ()
38 fi 38 fi
39 ;; 39 ;;
40 *) 40 *)
diff --git a/meta/packages/libtool/libtool-2.2.6/dolt.m4 b/meta/packages/libtool/libtool/dolt.m4
index 9bedecf273..9bedecf273 100644
--- a/meta/packages/libtool/libtool-2.2.6/dolt.m4
+++ b/meta/packages/libtool/libtool/dolt.m4
diff --git a/meta/packages/libtool/libtool-2.2.6/prefix.patch b/meta/packages/libtool/libtool/prefix.patch
index 639feb7456..895be1f9b0 100644
--- a/meta/packages/libtool/libtool-2.2.6/prefix.patch
+++ b/meta/packages/libtool/libtool/prefix.patch
@@ -1,22 +1,31 @@
1Renames "libtool" -> "${TARGET_PREFIX}libtool" which makes sure 1Renames "libtool" -> "${TARGET_PREFIX}libtool" which makes sure
2it can't be confused with the host libtool. 2it can't be confused with the host libtool.
3 3
4Index: libtool-2.2.2/libltdl/m4/libtool.m4 4
5After discussions with RP Changed host_alias to build_alias
6at one place as it was causing man page building issue while
7cross compiling for different architectures.
8
9Date: 2010/06/28
10Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
11
12
13Index: libtool-2.2.10/libltdl/m4/libtool.m4
5=================================================================== 14===================================================================
6--- libtool-2.2.2.orig/libltdl/m4/libtool.m4 2008-04-13 22:43:05.000000000 +0100 15--- libtool-2.2.10.orig/libltdl/m4/libtool.m4
7+++ libtool-2.2.2/libltdl/m4/libtool.m4 2008-04-13 22:43:05.000000000 +0100 16+++ libtool-2.2.10/libltdl/m4/libtool.m4
8@@ -89,7 +89,8 @@ 17@@ -94,7 +94,8 @@ _LT_SET_OPTIONS([$0], [$1])
9 LIBTOOL_DEPS="$ltmain" 18 LIBTOOL_DEPS="$ltmain"
10 19
11 # Always use our own libtool. 20 # Always use our own libtool.
12-LIBTOOL='$(SHELL) $(top_builddir)/libtool' 21-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
13+LIBTOOL='$(SHELL) $(top_builddir)' 22+LIBTOOL='$(SHELL) $(top_builddir)'
14+LIBTOOL="$LIBTOOL/$host_alias-libtool" 23+LIBTOOL="$LIBTOOL/${host_alias}-libtool"
15 AC_SUBST(LIBTOOL)dnl 24 AC_SUBST(LIBTOOL)dnl
16 25
17 _LT_SETUP 26 _LT_SETUP
18@@ -211,7 +212,7 @@ 27@@ -201,7 +202,7 @@ aix3*)
19 no_glob_subst='s/\*/\\\*/g' 28 esac
20 29
21 # Global variables: 30 # Global variables:
22-ofile=libtool 31-ofile=libtool
@@ -24,20 +33,20 @@ Index: libtool-2.2.2/libltdl/m4/libtool.m4
24 can_build_shared=yes 33 can_build_shared=yes
25 34
26 # All known linkers require a `.a' archive for static linking (except MSVC, 35 # All known linkers require a `.a' archive for static linking (except MSVC,
27Index: libtool-2.2.2/Makefile.am 36Index: libtool-2.2.10/Makefile.am
28=================================================================== 37===================================================================
29--- libtool-2.2.2.orig/Makefile.am 2008-04-01 19:06:08.000000000 +0100 38--- libtool-2.2.10.orig/Makefile.am
30+++ libtool-2.2.2/Makefile.am 2008-04-13 22:49:17.000000000 +0100 39+++ libtool-2.2.10/Makefile.am
31@@ -31,7 +31,7 @@ 40@@ -31,7 +31,7 @@ AM_LDFLAGS =
32 DIST_SUBDIRS = . 41 DIST_SUBDIRS = .
33 EXTRA_DIST = 42 EXTRA_DIST =
34 43
35-BUILT_SOURCES = libtool 44-BUILT_SOURCES = libtool libtoolize
36+BUILT_SOURCES = $(host_alias)-libtool 45+BUILT_SOURCES = $(host_alias)-libtool libtoolize
37 46
38 CLEANFILES = 47 CLEANFILES =
39 MOSTLYCLEANFILES = 48 MOSTLYCLEANFILES =
40@@ -64,7 +64,7 @@ 49@@ -65,7 +65,7 @@ rebuild = rebuild=:; $(timestamp); corre
41 ## ---------------- ## 50 ## ---------------- ##
42 51
43 # The libtool distributor and the standalone libtool script. 52 # The libtool distributor and the standalone libtool script.
@@ -46,7 +55,7 @@ Index: libtool-2.2.2/Makefile.am
46 55
47 libtoolize: $(srcdir)/libtoolize.in $(top_builddir)/config.status 56 libtoolize: $(srcdir)/libtoolize.in $(top_builddir)/config.status
48 rm -f libtoolize.tmp libtoolize 57 rm -f libtoolize.tmp libtoolize
49@@ -90,8 +90,8 @@ 58@@ -91,8 +91,8 @@ $(srcdir)/libtoolize.in: $(sh_files) lib
50 # We used to do this with a 'stamp-vcl' file, but non-gmake builds 59 # We used to do this with a 'stamp-vcl' file, but non-gmake builds
51 # would rerun configure on every invocation, so now we manually 60 # would rerun configure on every invocation, so now we manually
52 # check the version numbers from the build rule when necessary. 61 # check the version numbers from the build rule when necessary.
@@ -57,7 +66,7 @@ Index: libtool-2.2.2/Makefile.am
57 if test -f "$$target"; then \ 66 if test -f "$$target"; then \
58 set dummy `./$$target --version | sed 1q`; actualver="$$5"; \ 67 set dummy `./$$target --version | sed 1q`; actualver="$$5"; \
59 test "$$actualver" = "$$correctver" && rebuild=false; \ 68 test "$$actualver" = "$$correctver" && rebuild=false; \
60@@ -100,8 +100,8 @@ 69@@ -101,8 +101,8 @@ libtool: $(top_builddir)/config.status $
61 case $$prereq in *ChangeLog);; *) rebuild=:;; esac; \ 70 case $$prereq in *ChangeLog);; *) rebuild=:;; esac; \
62 done; \ 71 done; \
63 if $$rebuild; then \ 72 if $$rebuild; then \
@@ -68,16 +77,25 @@ Index: libtool-2.2.2/Makefile.am
68 fi 77 fi
69 78
70 .PHONY: configure-subdirs 79 .PHONY: configure-subdirs
71@@ -145,7 +145,7 @@ 80@@ -147,7 +147,7 @@ EXTRA_DIST += bootstrap $(srcdir)/li
72 ChangeLog.1999 ChangeLog.2000 ChangeLog.2001 \
73 ChangeLog.2002 ChangeLog.2003 ChangeLog.2004 \ 81 ChangeLog.2002 ChangeLog.2003 ChangeLog.2004 \
74 ChangeLog.2005 ChangeLog.2006 ChangeLog.2007 82 ChangeLog.2005 ChangeLog.2006 ChangeLog.2007 \
83 ChangeLog.2008 ChangeLog.2009
75-CLEANFILES += libtool libtoolize libtoolize.tmp \ 84-CLEANFILES += libtool libtoolize libtoolize.tmp \
76+CLEANFILES += $(host_alias)-libtool libtoolize libtoolize.tmp \ 85+CLEANFILES += $(host_alias)-libtool libtoolize libtoolize.tmp \
77 $(auxdir)/ltmain.tmp $(m4dir)/ltversion.tmp 86 $(auxdir)/ltmain.tmp $(m4dir)/ltversion.tmp
78 87
79 ## We build ltversion.m4 here, instead of from config.status, 88 ## We build ltversion.m4 here, instead of from config.status,
80@@ -483,12 +483,12 @@ 89@@ -337,7 +337,7 @@ update_mans = \
90 PATH=.$(PATH_SEPARATOR)$$PATH; export PATH; \
91 $(HELP2MAN) --output=$@
92 $(srcdir)/doc/libtool.1: $(srcdir)/$(auxdir)/ltmain.sh
93- $(update_mans) --help-option=--help-all libtool
94+ $(update_mans) --help-option=--help-all ${build_alias}-libtool
95 $(srcdir)/doc/libtoolize.1: $(srcdir)/libtoolize.in
96 $(update_mans) libtoolize
97
98@@ -523,12 +523,12 @@ TESTS_ENVIRONMENT = MAKE="$(MAKE)" CC="$
81 99
82 BUILDCHECK_ENVIRONMENT = _lt_pkgdatadir="$(abs_top_srcdir)" \ 100 BUILDCHECK_ENVIRONMENT = _lt_pkgdatadir="$(abs_top_srcdir)" \
83 LIBTOOLIZE="$(abs_top_builddir)/libtoolize" \ 101 LIBTOOLIZE="$(abs_top_builddir)/libtoolize" \
@@ -92,7 +110,7 @@ Index: libtool-2.2.2/Makefile.am
92 LTDLINCL="-I$(includedir)" \ 110 LTDLINCL="-I$(includedir)" \
93 LIBLTDL="$(libdir)/libltdl.la" \ 111 LIBLTDL="$(libdir)/libltdl.la" \
94 tst_aclocaldir="$(aclocaldir)" 112 tst_aclocaldir="$(aclocaldir)"
95@@ -620,7 +620,7 @@ 113@@ -679,7 +679,7 @@ if HAVE_FC
96 TESTS += $(FC_TESTS) 114 TESTS += $(FC_TESTS)
97 endif 115 endif
98 116
diff --git a/meta/packages/libtool/libtool-2.2.6/trailingslash.patch b/meta/packages/libtool/libtool/trailingslash.patch
index b1956a6134..f51c06406e 100644
--- a/meta/packages/libtool/libtool-2.2.6/trailingslash.patch
+++ b/meta/packages/libtool/libtool/trailingslash.patch
@@ -4,20 +4,20 @@ This is because libdir has a trailing slash which breaks the comparision.
4 4
5RP 2/1/10 5RP 2/1/10
6 6
7Index: libtool-2.2.6/libltdl/config/ltmain.m4sh 7Index: libtool-2.2.10/libltdl/config/ltmain.m4sh
8=================================================================== 8===================================================================
9--- libtool-2.2.6.orig/libltdl/config/ltmain.m4sh 2010-02-02 16:06:29.793905001 +0000 9--- libtool-2.2.10.orig/libltdl/config/ltmain.m4sh
10+++ libtool-2.2.6/libltdl/config/ltmain.m4sh 2010-02-02 16:06:59.415155959 +0000 10+++ libtool-2.2.10/libltdl/config/ltmain.m4sh
11@@ -1567,8 +1567,12 @@ 11@@ -1634,8 +1634,12 @@ func_mode_install ()
12 dir="$dir$objdir" 12 dir="$dir$objdir"
13 13
14 if test -n "$relink_command"; then 14 if test -n "$relink_command"; then
15+ # Strip any trailing slash from the destination. 15+ # Strip any trailing slash from the destination.
16+ func_stripname '' '/' "$libdir" 16+ func_stripname '' '/' "$libdir"
17+ destlibdir=$func_stripname_result 17+ destlibdir=$func_stripname_result
18+ 18+
19 # Determine the prefix the user has applied to our future dir. 19 # Determine the prefix the user has applied to our future dir.
20- inst_prefix_dir=`$ECHO "X$destdir" | $Xsed -e "s%$libdir\$%%"` 20- inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"`
21+ inst_prefix_dir=`$ECHO "X$destdir" | $Xsed -e "s%$destlibdir\$%%"` 21+ inst_prefix_dir=`$ECHO "X$destdir" | $Xsed -e "s%$destlibdir\$%%"`
22 22
23 # Don't allow the user to place us outside of our expected 23 # Don't allow the user to place us outside of our expected
diff --git a/meta/packages/libtool/libtool_2.2.6.bb b/meta/packages/libtool/libtool_2.2.10.bb
index e5deac7c40..cca3b1ea4a 100644
--- a/meta/packages/libtool/libtool_2.2.6.bb
+++ b/meta/packages/libtool/libtool_2.2.10.bb
@@ -1,10 +1,7 @@
1require libtool.inc 1require libtool.inc
2DEPENDS = "libtool-native"
2 3
3PR = "r21" 4PR = "r0"
4
5SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}a.tar.gz \
6 file://trailingslash.patch;patch=1 \
7 file://dolt.m4"
8 5
9PACKAGES =+ "libltdl libltdl-dev libltdl-dbg" 6PACKAGES =+ "libltdl libltdl-dev libltdl-dbg"
10FILES_${PN} += "${datadir}/aclocal*" 7FILES_${PN} += "${datadir}/aclocal*"