diff options
author | Alex Kiernan <alex.kiernan@gmail.com> | 2022-10-03 18:06:22 +0100 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2022-10-03 10:26:21 -0700 |
commit | 7361f9f75f85ba84ea074cb3b4f9d0c9afea0af3 (patch) | |
tree | ded0f43deb9ee2cfe42532643bd97949847b74b1 | |
parent | 4b26cded9c747a2d610a8abf0f4549df48a1db5e (diff) | |
download | meta-openembedded-7361f9f75f85ba84ea074cb3b4f9d0c9afea0af3.tar.gz |
jansson: Backport linker flag fixes
Fix overwriting linker flags.
Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r-- | meta-oe/recipes-extended/jansson/jansson/0001-Fix-overwriting-linker-flags.patch | 29 | ||||
-rw-r--r-- | meta-oe/recipes-extended/jansson/jansson_2.14.bb | 1 |
2 files changed, 30 insertions, 0 deletions
diff --git a/meta-oe/recipes-extended/jansson/jansson/0001-Fix-overwriting-linker-flags.patch b/meta-oe/recipes-extended/jansson/jansson/0001-Fix-overwriting-linker-flags.patch new file mode 100644 index 000000000..5eee6f85a --- /dev/null +++ b/meta-oe/recipes-extended/jansson/jansson/0001-Fix-overwriting-linker-flags.patch | |||
@@ -0,0 +1,29 @@ | |||
1 | From fe6e8eec7e7df4f1e72f0c9d9337b1fe11236687 Mon Sep 17 00:00:00 2001 | ||
2 | From: Thomas Heinrichs <46387399+Thomas1664@users.noreply.github.com> | ||
3 | Date: Thu, 28 Apr 2022 17:36:54 +0200 | ||
4 | Subject: [PATCH] Fix overwriting linker flags | ||
5 | |||
6 | Upstream-Status: Backport | ||
7 | [https://github.com/akheron/jansson/commit/fe6e8eec7e7df4f1e72f0c9d9337b1fe11236687] | ||
8 | Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> | ||
9 | |||
10 | --- | ||
11 | CMakeLists.txt | 2 +- | ||
12 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
13 | |||
14 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
15 | index 39b9ad365f78..ed33e3c47f70 100644 | ||
16 | --- a/CMakeLists.txt | ||
17 | +++ b/CMakeLists.txt | ||
18 | @@ -342,7 +342,7 @@ if(JANSSON_BUILD_SHARED_LIBS) | ||
19 | ) | ||
20 | list(REMOVE_ITEM CMAKE_REQUIRED_LIBRARIES "-Wl,--version-script,${CMAKE_CURRENT_BINARY_DIR}/jansson.sym") | ||
21 | if (VSCRIPT_WORKS) | ||
22 | - set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--version-script,${CMAKE_CURRENT_BINARY_DIR}/jansson.sym") | ||
23 | + set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--version-script,${CMAKE_CURRENT_BINARY_DIR}/jansson.sym") | ||
24 | endif() | ||
25 | endif() | ||
26 | |||
27 | -- | ||
28 | 2.35.1 | ||
29 | |||
diff --git a/meta-oe/recipes-extended/jansson/jansson_2.14.bb b/meta-oe/recipes-extended/jansson/jansson_2.14.bb index 68e24c890..39663d121 100644 --- a/meta-oe/recipes-extended/jansson/jansson_2.14.bb +++ b/meta-oe/recipes-extended/jansson/jansson_2.14.bb | |||
@@ -5,6 +5,7 @@ LICENSE = "MIT" | |||
5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=afd92c4cfc08f4896003251b878cc0bf" | 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=afd92c4cfc08f4896003251b878cc0bf" |
6 | 6 | ||
7 | SRC_URI = "https://github.com/akheron/${BPN}/releases/download/v${PV}/${BP}.tar.bz2 \ | 7 | SRC_URI = "https://github.com/akheron/${BPN}/releases/download/v${PV}/${BP}.tar.bz2 \ |
8 | file://0001-Fix-overwriting-linker-flags.patch \ | ||
8 | file://0001-Honour-multilib-paths.patch \ | 9 | file://0001-Honour-multilib-paths.patch \ |
9 | " | 10 | " |
10 | SRC_URI[sha256sum] = "fba956f27c6ae56ce6dfd52fbf9d20254aad42821f74fa52f83957625294afb9" | 11 | SRC_URI[sha256sum] = "fba956f27c6ae56ce6dfd52fbf9d20254aad42821f74fa52f83957625294afb9" |