Patchwork openocd: added v0.4.0

login
register
mail settings
Submitter Neil MacMunn
Date June 6, 2011, 5:20 p.m.
Message ID <1307380849-31354-1-git-send-email-neil@gumstix.com>
Download mbox | patch
Permalink /patch/5465/
State New, archived
Headers show

Comments

Neil MacMunn - June 6, 2011, 5:20 p.m.
* includes patch to prevent CROSS COMPILE Badness
* configure requires --enable-maintainer-mode to generate version.texi

Signed-off-by: Neil MacMunn <neil@gumstix.com>
---
 .../openocd/files/make-include-path-relative.patch |   13 +++++++++++
 recipes/openocd/openocd_0.4.bb                     |   23 ++++++++++++++++++++
 2 files changed, 36 insertions(+), 0 deletions(-)
 create mode 100644 recipes/openocd/files/make-include-path-relative.patch
 create mode 100644 recipes/openocd/openocd_0.4.bb

Patch

diff --git a/recipes/openocd/files/make-include-path-relative.patch b/recipes/openocd/files/make-include-path-relative.patch
new file mode 100644
index 0000000..d9a5147
--- /dev/null
+++ b/recipes/openocd/files/make-include-path-relative.patch
@@ -0,0 +1,13 @@ 
+diff --git a/configure.in.orig b/configure.in
+index 4681aeb..07f57f3 100644
+--- a/configure.in
++++ b/configure.in.modified
+@@ -186,7 +186,7 @@ then
+       LDFLAGS="$LDFLAGS -Wl,-rpath,$OCDxprefix/lib"
+     fi
+     # The "INCDIR" is also usable
+-    CFLAGS="$CFLAGS -I$includedir"
++    CFLAGS="$CFLAGS -I$sysroot/include"
+ fi
+ 
+ AC_ARG_WITH(ftd2xx,
diff --git a/recipes/openocd/openocd_0.4.bb b/recipes/openocd/openocd_0.4.bb
new file mode 100644
index 0000000..e74b5fe
--- /dev/null
+++ b/recipes/openocd/openocd_0.4.bb
@@ -0,0 +1,23 @@ 
+DESCRIPTION = "Free and Open On-Chip Debugging, In-System Programming and Boundary-Scan Testing"
+HOMEPAGE = "http://openocd.berlios.de/"
+LICENSE = "GPL"
+SRCREV = "56e74908d17d740db0a376f354c21e6608e8af8d"
+PV = "0.4"
+PR = "r0"
+
+DEPENDS = "libftdi"
+EXTRA_OECONF = " --enable-ft2232_libftdi --disable-werror --enable-maintainer-mode"
+
+SRC_URI = "git://openocd.git.sourceforge.net/gitroot/openocd/openocd;protocol=http;branch=master \
+          file://make-include-path-relative.patch"
+S = "${WORKDIR}/git"
+
+inherit autotools
+
+do_configure_append() {
+	for i in $(find ${S} -name Makefile) ; do
+		sed -i -e 's:-I/usr/include:${STAGING_INCDIR}:g' $i
+		sed -i -e 's:-L/usr/lib:-L${STAGING_LIBDIR}:g' $i
+	done
+}
+