[Buildroot] [PATCH v2,1/1] package/openocd: selects jimtcl

Yann E. MORIN yann.morin.1998 at free.fr
Sun Dec 22 10:43:37 UTC 2019


Fabrice, All,

On 2019-12-22 11:29 +0100, Fabrice Fontaine spake thusly:
> Selects jimtcl instead of using the bundled one and drop first patch as
> it is not needed anymore
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice at gmail.com>

Applied to master, thanks.

Regards,
Yann E. MORIN.

> ---
> Changes v1 -> v2 (after review of Thomas Petazzoni):
>  - Drop first patch
> 
>  ...configuration-to-force-static-librar.patch | 27 -------------------
>  ...1-configure-enable-build-on-uclinux.patch} |  0
>  ...vent-some-forms-of-Cross-Protocol-S.patch} |  0
>  package/openocd/Config.in                     |  1 +
>  package/openocd/openocd.mk                    | 10 +++----
>  5 files changed, 4 insertions(+), 34 deletions(-)
>  delete mode 100644 package/openocd/0001-Fix-jimtcl-auto-configuration-to-force-static-librar.patch
>  rename package/openocd/{0002-configure-enable-build-on-uclinux.patch => 0001-configure-enable-build-on-uclinux.patch} (100%)
>  rename package/openocd/{0003-CVE-2018-5704-Prevent-some-forms-of-Cross-Protocol-S.patch => 0002-CVE-2018-5704-Prevent-some-forms-of-Cross-Protocol-S.patch} (100%)
> 
> diff --git a/package/openocd/0001-Fix-jimtcl-auto-configuration-to-force-static-librar.patch b/package/openocd/0001-Fix-jimtcl-auto-configuration-to-force-static-librar.patch
> deleted file mode 100644
> index fd3cfa469a..0000000000
> --- a/package/openocd/0001-Fix-jimtcl-auto-configuration-to-force-static-librar.patch
> +++ /dev/null
> @@ -1,27 +0,0 @@
> -From 3bef159779c8fd39a070ec5c8191e18ba2efa79d Mon Sep 17 00:00:00 2001
> -From: Claudio Laurita <claudio.laurita at integrazionetotale.it>
> -Date: Sun, 30 Nov 2014 18:21:58 +0100
> -Subject: [PATCH 2/2] Fix jimtcl auto configuration to force static library
> - only. jimtcl ignores a --disable-shared option if a previous --enable-shared
> - option was given. This breaks openocd compilation if shared was the preferred
> - option in buildroot project.
> -
> -Signed-off-by: Claudio Laurita <claudio.laurita at integrazionetotale.it>
> -
> ---- a/jimtcl/auto.def
> -+++ b/jimtcl/auto.def
> -@@ -194,12 +194,8 @@
> -     msg-result "Enabling references"
> -     define JIM_REFERENCES
> - }
> --if {[opt-bool shared with-jim-shared]} {
> --    msg-result "Building shared library"
> --} else {
> --    msg-result "Building static library"
> --    define JIM_STATICLIB
> --}
> -+msg-result "Building static library"
> -+define JIM_STATICLIB
> - define LIBSOEXT [format [get-define SH_SOEXTVER] [format %.2f [expr {[get-define JIM_VERSION] / 100.0}]]]
> - define JIM_INSTALL [opt-bool install-jim]
> - define JIM_DOCS [opt-bool docs]
> diff --git a/package/openocd/0002-configure-enable-build-on-uclinux.patch b/package/openocd/0001-configure-enable-build-on-uclinux.patch
> similarity index 100%
> rename from package/openocd/0002-configure-enable-build-on-uclinux.patch
> rename to package/openocd/0001-configure-enable-build-on-uclinux.patch
> diff --git a/package/openocd/0003-CVE-2018-5704-Prevent-some-forms-of-Cross-Protocol-S.patch b/package/openocd/0002-CVE-2018-5704-Prevent-some-forms-of-Cross-Protocol-S.patch
> similarity index 100%
> rename from package/openocd/0003-CVE-2018-5704-Prevent-some-forms-of-Cross-Protocol-S.patch
> rename to package/openocd/0002-CVE-2018-5704-Prevent-some-forms-of-Cross-Protocol-S.patch
> diff --git a/package/openocd/Config.in b/package/openocd/Config.in
> index abba07e889..448872061b 100644
> --- a/package/openocd/Config.in
> +++ b/package/openocd/Config.in
> @@ -1,5 +1,6 @@
>  config BR2_PACKAGE_OPENOCD
>  	bool "openocd"
> +	select BR2_PACKAGE_JIMTCL
>  	help
>  	  OpenOCD - Open On-Chip Debugger
>  
> diff --git a/package/openocd/openocd.mk b/package/openocd/openocd.mk
> index d35ed77cd1..29e4f4b31f 100644
> --- a/package/openocd/openocd.mk
> +++ b/package/openocd/openocd.mk
> @@ -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) \
> -- 
> 2.24.0
> 
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'



More information about the buildroot mailing list