d3849946a3
Patch 0001 was removed a while ago, so rename the 0002 patch to 0001. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
28 lines
1 KiB
Diff
28 lines
1 KiB
Diff
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 @@
|
|
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]
|