[oe-commits] org.oe.dev libtool: Sync patches from Poky. Drop uneeded tag1 patch, make sure ltmain.sh regenerates for libtool-cross, package debug files, fix nmedit references, fix library search path handling particularly on darwin.
rpurdie commit
openembedded-commits at lists.openembedded.org
Sat Dec 1 23:30:30 UTC 2007
libtool: Sync patches from Poky. Drop uneeded tag1 patch, make sure ltmain.sh regenerates for libtool-cross, package debug files, fix nmedit references, fix library search path handling particularly on darwin.
Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: ae6899fa0cbb6e6a05a4fc508f7968c7580ca467
ViewMTN: http://monotone.openembedded.org/revision/info/ae6899fa0cbb6e6a05a4fc508f7968c7580ca467
Files:
1
packages/libtool/libtool-1.5.10/tag1.patch
packages/libtool/libtool-1.5.10/libdir-la2.patch
packages/libtool/libtool-cross_1.5.10.bb
packages/libtool/libtool-native_1.5.10.bb
packages/libtool/libtool_1.5.10.bb
Diffs:
#
# mt diff -r3aabc20dfb7d8071e5bdf12d6e53f635b0a51210 -rae6899fa0cbb6e6a05a4fc508f7968c7580ca467
#
#
#
# delete "packages/libtool/libtool-1.5.10/tag1.patch"
#
# add_file "packages/libtool/libtool-1.5.10/libdir-la2.patch"
# content [d1963c450f45aec334ceb0c17f3a8beeb5f990df]
#
# patch "packages/libtool/libtool-cross_1.5.10.bb"
# from [ea1ba26d91260c163e077eaf1ce72502cb22d75c]
# to [54bc11a40b3ffda524161118db81f8521ce06a24]
#
# patch "packages/libtool/libtool-native_1.5.10.bb"
# from [3db44cdc921e61d2528664266cd0eda2cbf4d430]
# to [1637e2be734e54d7a59c21c3b10070585210ca96]
#
# patch "packages/libtool/libtool_1.5.10.bb"
# from [a09ef5ec1049aa5911eaaeb30a1d607825a17d58]
# to [4e7a487d5beec4d7a20adea55794f9747fd8ab75]
#
============================================================
--- packages/libtool/libtool-1.5.10/libdir-la2.patch d1963c450f45aec334ceb0c17f3a8beeb5f990df
+++ packages/libtool/libtool-1.5.10/libdir-la2.patch d1963c450f45aec334ceb0c17f3a8beeb5f990df
@@ -0,0 +1,64 @@
+OE changes to installed=no which means we can't run the original test
+and just look in $objdir. We therefore look in both, preferring
+$objdir if it exists - RP 29/11/2007
+
+--- libtool-1.5.10/ltmain.in.orig
++++ libtool-1.5.10/ltmain.in
+@@ -3105,8 +3105,11 @@
+ fi
+ ;;
+ esac
+- if grep "^installed=no" $deplib > /dev/null; then
+- path="$absdir/$objdir"
++# OE changes to installed=no which means we can't run the original test
++# and just look in $objdir. We therefore look in both, preferring
++# $objdir if it exists, see below. - RP 29/11/2007
++# if grep "^installed=no" $deplib > /dev/null; then
++# path="$absdir/$objdir"
+ # This interferes with crosscompilation. -CL
+ # else
+ # eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+@@ -3117,7 +3120,7 @@
+ # if test "$absdir" != "$libdir"; then
+ # $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
+ # fi
+- else
++ if ! grep "^installed=no" $deplib > /dev/null; then
+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+ if test -z "$libdir"; then
+ $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
+@@ -3138,9 +3141,17 @@
+ for tmp in $deplibrary_names ; do
+ depdepl=$tmp
+ done
+- if test -f "$path/$depdepl" ; then
+- depdepl="$path/$depdepl"
++
++ if test -f "$absdir/$objdir/$depdepl" ; then
++ depdepl="$absdir/$objdir/$depdepl"
++ path="$absdir/$objdir"
++ elif test -f "$absdir/$depdepl" ; then
++ depdepl="$absdir/$depdepl"
++ path="$absdir"
++ else
++ path="$absdir/$objdir"
+ fi
++
+ # do not add paths which are already there
+ case " $newlib_search_path " in
+ *" $path "*) ;;
+@@ -3150,7 +3161,13 @@
+ path=""
+ ;;
+ *)
+- path="-L$path"
++ if test -d "$absdir/$objdir" ; then
++ path="-L$absdir/$objdir"
++ elif test -d "$absdir" ; then
++ path="-L$absdir"
++ else
++ path="-L$absdir/$objdir"
++ fi
+ ;;
+ esac
+ ;;
============================================================
--- packages/libtool/libtool-cross_1.5.10.bb ea1ba26d91260c163e077eaf1ce72502cb22d75c
+++ packages/libtool/libtool-cross_1.5.10.bb 54bc11a40b3ffda524161118db81f8521ce06a24
@@ -1,14 +1,17 @@ require libtool_${PV}.bb
SECTION = "devel"
require libtool_${PV}.bb
-PR = "r6"
+PR = "r9"
PACKAGES = ""
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libtool-${PV}"
SRC_URI_append = " file://libdir-la.patch;patch=1 \
+ file://libdir-la2.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"
+ file://install-path-check.patch;patch=1 \
+ file://nmedit_fix.patch;patch=1 \
+ file://nousrlib.patch;patch=1"
+
S = "${WORKDIR}/libtool-${PV}"
prefix = "${STAGING_DIR_NATIVE}${layout_prefix}"
@@ -16,7 +19,13 @@ do_compile () {
bindir = "${STAGING_BINDIR_NATIVE}"
do_compile () {
- :
+ rm -f ltmain.shT
+ date=`/bin/sh ./mkstamp < ./ChangeLog` && \
+ sed -e 's/@''PACKAGE@/libtool/' -e 's/@''VERSION@/1.5.10/' \
+ -e "s%@""TIMESTAMP@%$date%" ./ltmain.in > ltmain.shT
+ mv -f ltmain.shT ltmain.sh || \
+ (rm -f ltmain.sh && cp ltmain.shT ltmain.sh && rm -f ltmain.shT)
+ cp ltmain.sh ./libltdl/
}
do_stage () {
============================================================
--- packages/libtool/libtool-native_1.5.10.bb 3db44cdc921e61d2528664266cd0eda2cbf4d430
+++ packages/libtool/libtool-native_1.5.10.bb 1637e2be734e54d7a59c21c3b10070585210ca96
@@ -1,14 +1,16 @@ require libtool_${PV}.bb
SECTION = "devel"
require libtool_${PV}.bb
-PR = "r6"
+PR = "r9"
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libtool-${PV}"
SRC_URI_append = " file://libdir-la.patch;patch=1 \
+ file://libdir-la2.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 \
+ file://nousrlib.patch;patch=1 \
file://rpath-control.patch;patch=1"
+
S = "${WORKDIR}/libtool-${PV}"
inherit native
============================================================
--- packages/libtool/libtool_1.5.10.bb a09ef5ec1049aa5911eaaeb30a1d607825a17d58
+++ packages/libtool/libtool_1.5.10.bb 4e7a487d5beec4d7a20adea55794f9747fd8ab75
@@ -5,7 +5,7 @@ SECTION = "devel"
HOMEPAGE = "http://www.gnu.org/software/libtool/libtool.html"
LICENSE = "GPL"
SECTION = "devel"
-PR = "r3"
+PR = "r5"
SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \
file://autotools.patch;patch=1 \
@@ -13,10 +13,11 @@ S = "${WORKDIR}/libtool-${PV}"
file://3figures.patch;patch=1"
S = "${WORKDIR}/libtool-${PV}"
-PACKAGES = "libltdl libltdl-dev ${PN}"
+PACKAGES =+ "libltdl libltdl-dev libltdl-dbg"
FILES_${PN} += "${datadir}/aclocal*"
FILES_libltdl = "${libdir}/libltdl.so.*"
FILES_libltdl-dev = "${libdir}/libltdl.* ${includedir}/ltdl.h"
+FILES_libltdl-dbg = "${libdir}/.debug/"
inherit autotools
More information about the Openembedded-commits
mailing list