r1198 - in trunk/oe/packages/openocd: . openocd

laforge at sita.openmoko.org laforge at sita.openmoko.org
Thu Mar 1 19:25:22 CET 2007


Author: laforge
Date: 2007-03-01 19:25:22 +0100 (Thu, 01 Mar 2007)
New Revision: 1198

Added:
   trunk/oe/packages/openocd/openocd/
   trunk/oe/packages/openocd/openocd/openocd-link-static.patch
Modified:
   trunk/oe/packages/openocd/openocd_130.bb
   trunk/oe/packages/openocd/openocd_svn.bb
Log:
use -static instead of -Bstatic (in local copy of patch)


Added: trunk/oe/packages/openocd/openocd/openocd-link-static.patch
===================================================================
--- trunk/oe/packages/openocd/openocd/openocd-link-static.patch	2007-03-01 18:19:05 UTC (rev 1197)
+++ trunk/oe/packages/openocd/openocd/openocd-link-static.patch	2007-03-01 18:25:22 UTC (rev 1198)
@@ -0,0 +1,20 @@
+--- openocd/src/Makefile.am.orig	2007-03-01 11:51:41.000000000 -0300
++++ openocd/src/Makefile.am	2007-03-01 11:58:08.000000000 -0300
+@@ -7,7 +7,7 @@
+ 	-I$(top_srcdir)/src/flash -I$(top_srcdir)/src/pld $(all_includes)
+ 
+ # the library search path.
+-openocd_LDFLAGS = $(all_libraries) 
++openocd_LDFLAGS = -static $(all_libraries)
+ SUBDIRS = helper jtag xsvf target server flash pld
+ 
+ if IS_MINGW
+@@ -17,7 +17,7 @@
+ endif
+ 
+ if FT2232_LIBFTDI
+-FTDI2232LIB = -lftdi
++FTDI2232LIB = -lftdi -lusb
+ else
+ FTDI2232LIB =
+ endif

Modified: trunk/oe/packages/openocd/openocd_130.bb
===================================================================
--- trunk/oe/packages/openocd/openocd_130.bb	2007-03-01 18:19:05 UTC (rev 1197)
+++ trunk/oe/packages/openocd/openocd_130.bb	2007-03-01 18:25:22 UTC (rev 1198)
@@ -7,7 +7,7 @@
 
 SRC_URI = "svn://svn.berlios.de/;module=openocd;rev=130 \
 	   http://svn.openmoko.org/developers/werner/openocd-wait-patiently.patch;patch=1 \
-	   http://svn.openmoko.org/developers/werner/openocd-link-static.patch;patch=1"
+	   file://openocd-link-static.patch;patch=1"
 S = "${WORKDIR}/openocd/trunk"
 
 EXTRA_OECONF = "  --disable-ftdi2232 --disable-ftd2xx"  

Modified: trunk/oe/packages/openocd/openocd_svn.bb
===================================================================
--- trunk/oe/packages/openocd/openocd_svn.bb	2007-03-01 18:19:05 UTC (rev 1197)
+++ trunk/oe/packages/openocd/openocd_svn.bb	2007-03-01 18:25:22 UTC (rev 1198)
@@ -7,7 +7,7 @@
 
 SRC_URI = "svn://svn.berlios.de/;module=openocd \
 	   http://svn.openmoko.org/developers/werner/openocd-wait-patiently.patch;patch=1 \
-	   http://svn.openmoko.org/developers/werner/openocd-link-static.patch;patch=1"
+	   file://openocd-link-static.patch;patch=1"
 S = "${WORKDIR}/openocd/trunk"
 
 EXTRA_OECONF = "  --disable-ftdi2232 --disable-ftd2xx"  





More information about the commitlog mailing list