summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarek Vasut <marek.vasut@gmail.com>2007-04-22 21:32:05 +0000
committerPaul Sokolovsky <pmiscml@gmail.com>2007-04-22 21:32:05 +0000
commit300e02974776b68fcb8ad6720f8217bcbbcd0624 (patch)
tree4f1f59b81b3ad38bec0ab47655b537178c001bb2
parent7bfd0e447cdc7ad7ddc3a3f4258e5983c7a285f5 (diff)
btscanner 2.0: Make buildable with gcc4.
* Closes #2022.
-rw-r--r--packages/btscanner/btscanner_2.0.bb6
-rw-r--r--packages/btscanner/files/.mtn2git_empty0
-rw-r--r--packages/btscanner/files/gcc-4.patch12
3 files changed, 16 insertions, 2 deletions
diff --git a/packages/btscanner/btscanner_2.0.bb b/packages/btscanner/btscanner_2.0.bb
index 1e75824c0e..0478577320 100644
--- a/packages/btscanner/btscanner_2.0.bb
+++ b/packages/btscanner/btscanner_2.0.bb
@@ -3,10 +3,12 @@ SECTION = "libs"
PRIORITY = "optional"
HOMEPAGE = "http://www.pentest.co.uk/cgi-bin/viewcat.cgi?cat=downloads&section=01_bluetooth"
DEPENDS = "bluez-libs gdbm ncurses libxml2"
-PR = "r0"
+PR = "r1"
LICENSE = "GPLv2"
-SRC_URI = "http://www.pentest.co.uk/src/btscanner-${PV}.tar.bz2"
+SRC_URI = "http://www.pentest.co.uk/src/btscanner-${PV}.tar.bz2 \
+ file://gcc-4.patch;patch=1 \
+ "
#Yes, the packages uses this ugly hardcoded path instead of ${sysconfdir}
FILES_${PN} += "/usr/share/oui.txt"
diff --git a/packages/btscanner/files/.mtn2git_empty b/packages/btscanner/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/btscanner/files/.mtn2git_empty
diff --git a/packages/btscanner/files/gcc-4.patch b/packages/btscanner/files/gcc-4.patch
new file mode 100644
index 0000000000..dab2bfa2ff
--- /dev/null
+++ b/packages/btscanner/files/gcc-4.patch
@@ -0,0 +1,12 @@
+diff -Naur btscanner-2.0.orig/configure.in btscanner-2.0/configure.in
+--- btscanner-2.0.orig/configure.in 2004-11-01 12:56:02.000000000 +0100
++++ btscanner-2.0/configure.in 2007-03-11 14:58:09.000000000 +0100
+@@ -64,7 +64,7 @@
+
+ # CFLAGS
+ CFLAGS="$CFLAGS -Wall -pthread -Wshadow -Wbad-function-cast \
+- -Wformat -Wimplicit-function-dec -Wparentheses -Wsign-compare \
++ -Wformat -Wparentheses -Wsign-compare \
+ -Wstrict-prototypes -Wtrigraphs -Wundef -Wuninitialized \
+ -W -Wunused -Wformat-security -Wmissing-braces -Wbad-function-cast \
+ -Wcast-qual -falign-functions -falign-labels -falign-loops\