[oe-commits] org.oe.oz354x bluez-utils(-nodbus): unbreak do_configure with patch from .dev

[hrw commit]

bluez-utils(-nodbus): unbreak do_configure with patch from .dev

Author: hrw at openembedded.org
Branch: org.openembedded.oz354x
Revision: 6788a7e670e363749556cafc826a114822ef95e9
ViewMTN: http://monotone.openembedded.org/revision.psp?id=6788a7e670e363749556cafc826a114822ef95e9
Files:
1
packages/bluez/files/no-user-include.patch
packages/bluez/bluez-utils-dbus_2.21.bb
packages/bluez/bluez-utils-dbus_2.25.bb
packages/bluez/bluez-utils-nodbus_2.21.bb
packages/bluez/bluez-utils.inc
Diffs:

#
# mt diff -rf12143ef7c3e620bcf0287dfcf28ea8c5157e7e1 -r6788a7e670e363749556cafc826a114822ef95e9
#
# 
# 
# add_file "packages/bluez/files/no-user-include.patch"
#  content [bfbb49e20f6ea681b46f84a496a4af1ab7f5a1d1]
# 
# patch "packages/bluez/bluez-utils-dbus_2.21.bb"
#  from [58c098f193add0e7d333420fcc8a1592f6a359b2]
#    to [d7cab0bbdb2726b1a976d986bd892272ffcec6dd]
# 
# patch "packages/bluez/bluez-utils-dbus_2.25.bb"
#  from [9ad06dc392cf83fc3abb06a5c5b54903bbd57361]
#    to [6b648c34b66e41b07542e827788b4029b28f7826]
# 
# patch "packages/bluez/bluez-utils-nodbus_2.21.bb"
#  from [015eed90224fdfe3d180e3df5883f37974680057]
#    to [a06f78fa5e149e04a821e36cfaea48434f2e429a]
# 
# patch "packages/bluez/bluez-utils.inc"
#  from [9ec59ce69387ef867c44104b65a9266f96c9bf99]
#    to [4437871c00f1b1d6e7257658f692ee9c221077c9]
# 
============================================================
--- packages/bluez/files/no-user-include.patch	bfbb49e20f6ea681b46f84a496a4af1ab7f5a1d1
+++ packages/bluez/files/no-user-include.patch	bfbb49e20f6ea681b46f84a496a4af1ab7f5a1d1
@@ -0,0 +1,18 @@
+Do not add -I/usr/include to the compile line just because we will
+install bluez-utils there says zecke...
+
+Index: bluez-utils-2.25/acinclude.m4
+===================================================================
+--- bluez-utils-2.25.orig/acinclude.m4	2006-05-18 12:39:57.473577920 +0200
++++ bluez-utils-2.25/acinclude.m4	2006-05-19 00:58:52.694599848 +0200
+@@ -69,7 +69,9 @@
+ 	ac_save_LDFLAGS=$LDFLAGS
+ 
+ 	BLUEZ_CFLAGS=""
+-	test -d "${bluez_prefix}/include" && BLUEZ_CFLAGS="$BLUEZ_CFLAGS -I${bluez_prefix}/include"
++	if test "$cross_compiling" = no; then
++		test -d "${bluez_prefix}/include" && BLUEZ_CFLAGS="$BLUEZ_CFLAGS -I${bluez_prefix}/include"
++	fi
+ 
+ 	CPPFLAGS="$CPPFLAGS $BLUEZ_CFLAGS"
+ 	AC_CHECK_HEADER(bluetooth/bluetooth.h, dummy=yes, AC_MSG_ERROR(Bluetooth header files not found))
============================================================
--- packages/bluez/bluez-utils-dbus_2.21.bb	58c098f193add0e7d333420fcc8a1592f6a359b2
+++ packages/bluez/bluez-utils-dbus_2.21.bb	d7cab0bbdb2726b1a976d986bd892272ffcec6dd
@@ -1,6 +1,6 @@ include bluez-utils.inc
 include bluez-utils.inc
 
-PR = "r7"
+PR = "r8"
 
 DEPENDS += "dbus"
 SRC_URI += "file://dbus.patch;patch=1 \ 
============================================================
--- packages/bluez/bluez-utils-dbus_2.25.bb	9ad06dc392cf83fc3abb06a5c5b54903bbd57361
+++ packages/bluez/bluez-utils-dbus_2.25.bb	6b648c34b66e41b07542e827788b4029b28f7826
@@ -1,6 +1,6 @@ require bluez-utils.inc
 require bluez-utils.inc
 
-PR = "r1"
+PR = "r2"
 
 DEPENDS += "dbus"
 SRC_URI += "file://dbus-2.24.patch;patch=1 \
============================================================
--- packages/bluez/bluez-utils-nodbus_2.21.bb	015eed90224fdfe3d180e3df5883f37974680057
+++ packages/bluez/bluez-utils-nodbus_2.21.bb	a06f78fa5e149e04a821e36cfaea48434f2e429a
@@ -1,5 +1,5 @@ include bluez-utils.inc
 include bluez-utils.inc
 
-PR = "r5"
+PR = "r6"
 
 EXTRA_OECONF += "--without-dbus"
============================================================
--- packages/bluez/bluez-utils.inc	9ec59ce69387ef867c44104b65a9266f96c9bf99
+++ packages/bluez/bluez-utils.inc	4437871c00f1b1d6e7257658f692ee9c221077c9
@@ -8,6 +8,7 @@ SRC_URI = "http://bluez.sourceforge.net/
 SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \
 	file://base.patch;patch=1 \
 	file://blueboxes.patch;patch=1 \
+	file://no-user-include.patch;patch=1 \
 	file://hcid.conf \
 	file://bluetooth.default \
 	file://bluetooth.conf \