kumquat-buildroot/package/openocd/0002-Fix-jimtcl-auto-configuration-to-force-static-librar.patch

28 lines
1.0 KiB
Diff
Raw Normal View History

openocd: bump to version 0.8.0 This patch adds the management of (almost) all the config options of openocd 0.8.0. A BR config variable is added for (almost) every adapter known to openocd and all the dependencies are automatically calculated from the chosen adapters, so only the necessary libraries are built. Note that CMSIS_DAP adapter requires hidapi (not libhid) and hidapi is not actually included in buildroot, so it has been removed. Also zy1000 adapters are actually broken in openocd and have been removed. The host version of the package enables all the possible adapters and the related libraries. [Thomas: - Slightly fixup the commit log. - Rename the patches to the new patch naming convention. - Update hash file using a contribution from Vincent Stehlé. - Move the thread dependency from the OpenOCD option down to each sub-option that actually needs it (when it needs libusb, libusb-compat or libftdi). We keep only one comment, as we would otherwise have to add too many repeatitive comments. - Remove commented options. - Add missing dependency on BR2_ARCH_HAS_ATOMICS when selecting BR2_PACKAGE_LIBFTDI. - Remove trailing white spaces. - Pass -std=gnu99, needed to build with a basic toolchain. - Write the OPENOCD_DEPENDENCIES and OPENOCD_CONF_OPTS conditions in a more compact way. - Adjust indentation for HOST_OPENOCD_CONF_OPTS. - Reword the comment above HOST_OPENOCD_CONF_OPTS.] Signed-off-by: Claudio Laurita <claudio.laurita@integrazionetotale.it> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-12-14 20:02:17 +01:00
From 3bef159779c8fd39a070ec5c8191e18ba2efa79d Mon Sep 17 00:00:00 2001
From: Claudio Laurita <claudio.laurita@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@integrazionetotale.it>
--- a/jimtcl/auto.def
+++ b/jimtcl/auto.def
@@ -194,12 +194,8 @@
openocd: bump to version 0.8.0 This patch adds the management of (almost) all the config options of openocd 0.8.0. A BR config variable is added for (almost) every adapter known to openocd and all the dependencies are automatically calculated from the chosen adapters, so only the necessary libraries are built. Note that CMSIS_DAP adapter requires hidapi (not libhid) and hidapi is not actually included in buildroot, so it has been removed. Also zy1000 adapters are actually broken in openocd and have been removed. The host version of the package enables all the possible adapters and the related libraries. [Thomas: - Slightly fixup the commit log. - Rename the patches to the new patch naming convention. - Update hash file using a contribution from Vincent Stehlé. - Move the thread dependency from the OpenOCD option down to each sub-option that actually needs it (when it needs libusb, libusb-compat or libftdi). We keep only one comment, as we would otherwise have to add too many repeatitive comments. - Remove commented options. - Add missing dependency on BR2_ARCH_HAS_ATOMICS when selecting BR2_PACKAGE_LIBFTDI. - Remove trailing white spaces. - Pass -std=gnu99, needed to build with a basic toolchain. - Write the OPENOCD_DEPENDENCIES and OPENOCD_CONF_OPTS conditions in a more compact way. - Adjust indentation for HOST_OPENOCD_CONF_OPTS. - Reword the comment above HOST_OPENOCD_CONF_OPTS.] Signed-off-by: Claudio Laurita <claudio.laurita@integrazionetotale.it> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-12-14 20:02:17 +01:00
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}]]]
openocd: bump to version 0.8.0 This patch adds the management of (almost) all the config options of openocd 0.8.0. A BR config variable is added for (almost) every adapter known to openocd and all the dependencies are automatically calculated from the chosen adapters, so only the necessary libraries are built. Note that CMSIS_DAP adapter requires hidapi (not libhid) and hidapi is not actually included in buildroot, so it has been removed. Also zy1000 adapters are actually broken in openocd and have been removed. The host version of the package enables all the possible adapters and the related libraries. [Thomas: - Slightly fixup the commit log. - Rename the patches to the new patch naming convention. - Update hash file using a contribution from Vincent Stehlé. - Move the thread dependency from the OpenOCD option down to each sub-option that actually needs it (when it needs libusb, libusb-compat or libftdi). We keep only one comment, as we would otherwise have to add too many repeatitive comments. - Remove commented options. - Add missing dependency on BR2_ARCH_HAS_ATOMICS when selecting BR2_PACKAGE_LIBFTDI. - Remove trailing white spaces. - Pass -std=gnu99, needed to build with a basic toolchain. - Write the OPENOCD_DEPENDENCIES and OPENOCD_CONF_OPTS conditions in a more compact way. - Adjust indentation for HOST_OPENOCD_CONF_OPTS. - Reword the comment above HOST_OPENOCD_CONF_OPTS.] Signed-off-by: Claudio Laurita <claudio.laurita@integrazionetotale.it> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-12-14 20:02:17 +01:00
define JIM_INSTALL [opt-bool install-jim]
define JIM_DOCS [opt-bool docs]