[oe-commits] org.oe.dev libtool-{cross, native}_1.5.22 : Add changes from Poky to 1.5.22.

[crofton commit]

libtool-{cross,native}_1.5.22 : Add changes from Poky to 1.5.22.

Author: crofton at openembedded.org
Branch: org.openembedded.dev
Revision: 36a3e8d1c238807062d51987c38ef05ebad7767c
ViewMTN: http://monotone.openembedded.org/revision.psp?id=36a3e8d1c238807062d51987c38ef05ebad7767c
Files:
1
packages/libtool/libtool-cross_1.5.22.bb
packages/libtool/libtool-native_1.5.22.bb
Diffs:

#
# mt diff -rd7c91f1b16ce3ae8f9b5cea5385143e298d2082e -r36a3e8d1c238807062d51987c38ef05ebad7767c
#
# 
# 
# patch "packages/libtool/libtool-cross_1.5.22.bb"
#  from [7a89f3896cc5ed6482a4deba550ae36eedda0fa9]
#    to [8781dff8a46c0bea69977caef3d35f6377ba2db2]
# 
# patch "packages/libtool/libtool-native_1.5.22.bb"
#  from [056768bfba0e981482b356ac04d2d20ff9b71d5b]
#    to [033211d8e0f97f94c886544a0033645580a09c7f]
# 
============================================================
--- packages/libtool/libtool-cross_1.5.22.bb	7a89f3896cc5ed6482a4deba550ae36eedda0fa9
+++ packages/libtool/libtool-cross_1.5.22.bb	8781dff8a46c0bea69977caef3d35f6377ba2db2
@@ -10,6 +10,7 @@ SRC_URI_append = " file://libdir-la.patc
                    file://prefix.patch;patch=1 \
                    file://tag.patch;patch=1 \
                    file://tag1.patch;patch=1 \
+                   file://rpath.patch;patch=1 \
                    file://install-path-check.patch;patch=1"
 S = "${WORKDIR}/libtool-${PV}"
 
@@ -23,6 +24,13 @@ do_stage () {
 
 do_stage () {
         install -m 0755 ${HOST_SYS}-libtool ${bindir}/${HOST_SYS}-libtool
+        install -m 0644 libltdl/ltdl.h ${STAGING_INCDIR}/
+        install -d ${STAGING_DATADIR}/libtool ${STAGING_DATADIR}/aclocal
+        install -c config.guess ${STAGING_DATADIR}/libtool/
+        install -c config.sub ${STAGING_DATADIR}/libtool/
+        install -c -m 0644 ltmain.sh ${STAGING_DATADIR}/libtool/
+        install -c -m 0644 libtool.m4 ${STAGING_DATADIR}/aclocal/
+        install -c -m 0644 ltdl.m4 ${STAGING_DATADIR}/aclocal/
 }
 
 do_install () {
============================================================
--- packages/libtool/libtool-native_1.5.22.bb	056768bfba0e981482b356ac04d2d20ff9b71d5b
+++ packages/libtool/libtool-native_1.5.22.bb	033211d8e0f97f94c886544a0033645580a09c7f
@@ -12,8 +12,6 @@ S = "${WORKDIR}/libtool-${PV}"
                    file://install-path-check.patch;patch=1"
 S = "${WORKDIR}/libtool-${PV}"
 
-STAGING_DATADIR_safe := "${STAGING_DATADIR}"
-
 inherit native
 
 do_stage () {
@@ -21,22 +19,12 @@ do_stage () {
 	install -m 0755 libtoolize ${STAGING_BINDIR}/libtoolize
 	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
+	install -d ${STAGING_DATADIR}/libtool ${STAGING_DATADIR}/aclocal
+	install -c config.guess ${STAGING_DATADIR}/libtool/
+	install -c config.sub ${STAGING_DATADIR}/libtool/
+	install -c -m 0644 ltmain.sh ${STAGING_DATADIR}/libtool/
+	install -c -m 0644 libtool.m4 ${STAGING_DATADIR}/aclocal/
+	install -c -m 0644 ltdl.m4 ${STAGING_DATADIR}/aclocal/
 }
 
 do_install () {