Skip to contentSkip to conversation

package/openocd: selects jimtcl

PATCH Superseded Fabrice Fontaine 2 participants 2 messages Dec 17, 2019 – Dec 22, 2019

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/openocd: selects jimtcl

Selects jimtcl instead of using the bundled one

---
 package/openocd/Config.in  |  1 +
 package/openocd/openocd.mk | 10 +++-------
 2 files changed, 4 insertions(+), 7 deletions(-)
package/openocd/Config.in +1 -0
index abba07e889..448872061b 100644
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_OPENOCD
 	bool "openocd"
+	select BR2_PACKAGE_JIMTCL
 	help
 	  OpenOCD - Open On-Chip Debugger
 
package/openocd/openocd.mk +3 -7
index d35ed77cd1..29e4f4b31f 100644
@@ -11,18 +11,13 @@ OPENOCD_LICENSE = GPL-2.0+
 OPENOCD_LICENSE_FILES = COPYING
 # 0002-configure-enable-build-on-uclinux.patch patches configure.ac
 OPENOCD_AUTORECONF = YES
-
-# The bundled jimtcl really wants to find a existing $CXX, so feed it
-# false when we do not have one.
-OPENOCD_CONF_ENV = \
-	$(if $(BR2_INSTALL_LIBSTDCPP),,CXX=false) \
-	CFLAGS="$(TARGET_CFLAGS) -std=gnu99"
+OPENOCD_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -std=gnu99"
 
 OPENOCD_CONF_OPTS = \
 	--oldincludedir=$(STAGING_DIR)/usr/include \
 	--includedir=$(STAGING_DIR)/usr/include \
 	--disable-doxygen-html \
-	--with-jim-shared=no \
+	--disable-internal-jimtcl \
 	--disable-shared \
 	--enable-dummy \
 	--disable-werror
@@ -32,6 +27,7 @@ OPENOCD_CONF_OPTS = \
 
 OPENOCD_DEPENDENCIES = \
 	host-pkgconf \
+	jimtcl \
 	$(if $(BR2_PACKAGE_LIBFTDI1),libftdi1) \
 	$(if $(BR2_PACKAGE_LIBUSB),libusb) \
 	$(if $(BR2_PACKAGE_LIBUSB_COMPAT),libusb-compat) \
Signature · 1 line
2.24.0
#1 lore raw

PATCH 1/1 package/openocd: selects jimtcl

Quoted 3 lines · On Tue, 17 Dec 2019 20:31:18 +0100 Fabrice Fontaine…

Selects jimtcl instead of using the bundled one

Is package/openocd/0001-Fix-jimtcl-auto-configuration-to-force-static-librar.patch still needed after this patch ?

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com