summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHolger Freyther <zecke@selfish.org>2006-05-18 23:25:26 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-05-18 23:25:26 +0000
commit2b91e2e1153d395bd458ea3d3e0705ffb0ddbe61 (patch)
tree56110122abe3931806e72fe46cec4659543db562
parent130a3f841d9a0324e10f4bd7e87539b44ea05c7c (diff)
packages/bluez/bluez-utils: Do not add -I/usr/include
bluez add prefix/include to the include path. While we have /usr as prefix we certainly don't want to include /usr/include. The attachs patch disables this when cross compiling.
-rw-r--r--packages/bluez/bluez-utils.inc1
-rw-r--r--packages/bluez/files/no-user-include.patch18
2 files changed, 19 insertions, 0 deletions
diff --git a/packages/bluez/bluez-utils.inc b/packages/bluez/bluez-utils.inc
index c68df7bd47..db5ddf066d 100644
--- a/packages/bluez/bluez-utils.inc
+++ b/packages/bluez/bluez-utils.inc
@@ -8,6 +8,7 @@ LICENSE = "GPL"
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 \
diff --git a/packages/bluez/files/no-user-include.patch b/packages/bluez/files/no-user-include.patch
new file mode 100644
index 0000000000..8c1b1b6d6d
--- /dev/null
+++ b/packages/bluez/files/no-user-include.patch
@@ -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))