[oe-commits] org.oe.packaged-staging libtool: sync with .dev

[rpurdie commit]

libtool: sync with .dev

Author: rpurdie at openembedded.org
Branch: org.openembedded.packaged-staging
Revision: 573008c6db2425d944455d1d21c05bcfd1693656
ViewMTN: http://monotone.openembedded.org/revision.psp?id=573008c6db2425d944455d1d21c05bcfd1693656
Files:
1
packages/libtool/libtool-1.5
packages/libtool/libtool-1.5/autotools.patch
packages/libtool/libtool-1.5/chmod.patch
packages/libtool/libtool-1.5/install-path-check.patch
packages/libtool/libtool-1.5/ld.patch
packages/libtool/libtool-1.5/libdir-la.patch
packages/libtool/libtool-1.5/libtool15-update-configscripts.patch
packages/libtool/libtool-1.5/m4.patch
packages/libtool/libtool-1.5/prefix.patch
packages/libtool/libtool-1.5/sedvar.patch
packages/libtool/libtool-1.5/tag.patch
packages/libtool/libtool-1.5.10/tag1.patch
packages/libtool/libtool-cross_1.5.10.bb
packages/libtool/libtool-native_1.5.10.bb
Diffs:

#
# mt diff -r85ed7437ca5becf313b332b01cbed3a5d907f0bc -r573008c6db2425d944455d1d21c05bcfd1693656
#
# 
# 
# delete "packages/libtool/libtool-1.5"
# 
# delete "packages/libtool/libtool-1.5/autotools.patch"
# 
# delete "packages/libtool/libtool-1.5/chmod.patch"
# 
# delete "packages/libtool/libtool-1.5/install-path-check.patch"
# 
# delete "packages/libtool/libtool-1.5/ld.patch"
# 
# delete "packages/libtool/libtool-1.5/libdir-la.patch"
# 
# delete "packages/libtool/libtool-1.5/libtool15-update-configscripts.patch"
# 
# delete "packages/libtool/libtool-1.5/m4.patch"
# 
# delete "packages/libtool/libtool-1.5/prefix.patch"
# 
# delete "packages/libtool/libtool-1.5/sedvar.patch"
# 
# delete "packages/libtool/libtool-1.5/tag.patch"
# 
# add_file "packages/libtool/libtool-1.5.10/tag1.patch"
#  content [1f5908bde1ad558ae2c7229ec733edcf4f2a6d9b]
# 
# patch "packages/libtool/libtool-cross_1.5.10.bb"
#  from [3a0bb0c8a45c29abbb8dec2553ebfb606e6a476d]
#    to [26aab2f0ec2113741c9306e176b7dd2a176471eb]
# 
# patch "packages/libtool/libtool-native_1.5.10.bb"
#  from [dbb109f3890af1e790b8a5f1f4608ba59d8938d1]
#    to [e1d2b08387782afbf7c5c6787a92d9af864dfb2d]
# 
============================================================
--- packages/libtool/libtool-1.5.10/tag1.patch	1f5908bde1ad558ae2c7229ec733edcf4f2a6d9b
+++ packages/libtool/libtool-1.5.10/tag1.patch	1f5908bde1ad558ae2c7229ec733edcf4f2a6d9b
@@ -0,0 +1,13 @@
+Index: libtool-1.5.10/libltdl/ltmain.sh
+===================================================================
+--- libtool-1.5.10.orig/libltdl/ltmain.sh	2004-09-19 13:34:44.000000000 +0100
++++ libtool-1.5.10/libltdl/ltmain.sh	2006-05-25 15:28:39.000000000 +0100
+@@ -232,7 +232,7 @@
+ 	if test -z "$tagname"; then
+ 	  $echo "$modename: unable to infer tagged configuration"
+ 	  $echo "$modename: specify a tag with \`--tag'" 1>&2
+-	  exit $EXIT_FAILURE
++#	  exit $EXIT_FAILURE
+ #        else
+ #          $echo "$modename: using $tagname tagged configuration"
+ 	fi
============================================================
--- packages/libtool/libtool-cross_1.5.10.bb	3a0bb0c8a45c29abbb8dec2553ebfb606e6a476d
+++ packages/libtool/libtool-cross_1.5.10.bb	26aab2f0ec2113741c9306e176b7dd2a176471eb
@@ -1,11 +1,13 @@ SECTION = "devel"
 SECTION = "devel"
-include libtool_${PV}.bb
+require libtool_${PV}.bb
 
+PR = "r4"
 PACKAGES = ""
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libtool-${PV}"
 SRC_URI_append = " file://libdir-la.patch;patch=1 \
                    file://prefix.patch;patch=1 \
                    file://tag.patch;patch=1 \
+                   file://tag1.patch;patch=1 \
                    file://install-path-check.patch;patch=1"
 S = "${WORKDIR}/libtool-${PV}"
 
============================================================
--- packages/libtool/libtool-native_1.5.10.bb	dbb109f3890af1e790b8a5f1f4608ba59d8938d1
+++ packages/libtool/libtool-native_1.5.10.bb	e1d2b08387782afbf7c5c6787a92d9af864dfb2d
@@ -1,11 +1,12 @@ SECTION = "devel"
 SECTION = "devel"
-include libtool_${PV}.bb
+require libtool_${PV}.bb
 
-PR = "r3"
+PR = "r4"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libtool-${PV}"
 SRC_URI_append = " file://libdir-la.patch;patch=1 \
                    file://prefix.patch;patch=1 \
                    file://tag.patch;patch=1 \
+                   file://tag1.patch;patch=1 \
                    file://install-path-check.patch;patch=1"
 S = "${WORKDIR}/libtool-${PV}"
 
@@ -19,13 +20,20 @@ do_stage () {
 	oe_libinstall -a -so -C libltdl libltdl ${STAGING_LIBDIR}
 	install -m 0644 libltdl/ltdl.h ${STAGING_INCDIR}/
 	for dir in ${STAGING_DATADIR} ${STAGING_DATADIR_safe}; do
+		ltdldir="${dir}/libtool/libltdl"
 		install -d $dir/libtool \
+			   $ltdldir \
 			   $dir/aclocal
 		install -c config.guess $dir/libtool/config.guess
 		install -c config.sub $dir/libtool/config.sub
 		install -c -m 0644 ltmain.sh $dir/libtool/
 		install -c -m 0644 libtool.m4 $dir/aclocal/
 		install -c -m 0644 ltdl.m4 $dir/aclocal/
+
+		for src in README COPYING.LIB Makefile.am configure.ac \
+				config-h.in ltdl.c ltdl.h; do
+			install -m 0644 libltdl/${src} ${ltdldir}
+		done
 	done
 }