From e9b171e0738c2acef0650328b7f2e1ae7cdc55cc Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Fri, 21 Nov 2003 18:27:14 +0000 Subject: Numerous build fixes from an oemake -a run, including two more fixes for libtool 'libdir from .la file leaking into library search path' situations. BKrev: 3fbe5902eywlLRHkRQ1FaDS5C01-jg --- bluez-hcidump/bluez-hcidump-1.5/configure.patch | 29 +++++++++++++++++++++++++ bluez-hcidump/bluez-hcidump_1.5.oe | 13 +++++++++++ 2 files changed, 42 insertions(+) (limited to 'bluez-hcidump') diff --git a/bluez-hcidump/bluez-hcidump-1.5/configure.patch b/bluez-hcidump/bluez-hcidump-1.5/configure.patch index e69de29bb2..fe40bfb3ad 100644 --- a/bluez-hcidump/bluez-hcidump-1.5/configure.patch +++ b/bluez-hcidump/bluez-hcidump-1.5/configure.patch @@ -0,0 +1,29 @@ + +# +# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher +# + +--- bluez-hcidump-1.5/configure.in~configure ++++ bluez-hcidump-1.5/configure.in +@@ -24,8 +24,8 @@ + AC_ARG_WITH(bluez-libs, + --with-bluez-libs=DIR BlueZ libraries and header files, + [ +- BLUEZ_INCDIR="$withval"/include +- BLUEZ_LIBDIR="$withval"/src ++ BLUEZ_INCDIR="$withval/include $withval/include/bluetooth" ++ BLUEZ_LIBDIR="$withval"/lib + ],[ + BLUEZ_INCDIR='../libs/include /usr/include/bluetooth' + BLUEZ_LIBDIR='../libs/src /usr/lib' +--- bluez-hcidump-1.5/acinclude.m4~configure ++++ bluez-hcidump-1.5/acinclude.m4 +@@ -74,7 +74,7 @@ + p=`cd $p && pwd` + + # Check for libtool library +- if test -f $p/lib$1.la; then ++ if test -f $p/lib$1.la -a -d $p/.libs; then + path=$p/.libs + else + path=$p diff --git a/bluez-hcidump/bluez-hcidump_1.5.oe b/bluez-hcidump/bluez-hcidump_1.5.oe index e69de29bb2..aa8f25f932 100644 --- a/bluez-hcidump/bluez-hcidump_1.5.oe +++ b/bluez-hcidump/bluez-hcidump_1.5.oe @@ -0,0 +1,13 @@ +SECTION="libs" +PRIORITY="optional" +RDEPENDS="libc6" +SECTION="libs" +DEPENDS=virtual/libc virtual/libbluetooth + +SRC_URI = http://bluez.sourceforge.net/download/${PN}-${PV}.tar.gz \ + file://${FILESDIR}/configure.patch;patch=1 +S=${WORKDIR}/${P} + +EXTRA_OECONF:="--with-bluez-libs=${STAGING_DIR}/target" + +inherit autotools libtool -- cgit v1.2.3