summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2019-05-21 18:11:58 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-05-22 07:24:51 +0100
commit9ddfe4061953b8112c8d00e32b5876900b5d3980 (patch)
treefcc7a8d88fe7ae56efa3428b084ae260dd1e5ec8 /meta/recipes-devtools
parent6e013c83bce5b545b83dd8bccb200aee026696af (diff)
downloadpoky-9ddfe4061953b8112c8d00e32b5876900b5d3980.tar.gz
libmodulemd: fix erroneous linking against v2 library when v1 was requested
(From OE-Core rev: f754a9bd0c0b53e449f66d792b5387de6a822865) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/libmodulemd/libmodulemd/0001-v1-meson.build-explicitly-specify-the-v1-library-in-.patch28
-rw-r--r--meta/recipes-devtools/libmodulemd/libmodulemd_git.bb1
2 files changed, 29 insertions, 0 deletions
diff --git a/meta/recipes-devtools/libmodulemd/libmodulemd/0001-v1-meson.build-explicitly-specify-the-v1-library-in-.patch b/meta/recipes-devtools/libmodulemd/libmodulemd/0001-v1-meson.build-explicitly-specify-the-v1-library-in-.patch
new file mode 100644
index 0000000000..1568d25f9d
--- /dev/null
+++ b/meta/recipes-devtools/libmodulemd/libmodulemd/0001-v1-meson.build-explicitly-specify-the-v1-library-in-.patch
@@ -0,0 +1,28 @@
1From b651551134cf170038b3e01812e3767969506491 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Tue, 21 May 2019 17:59:26 +0200
4Subject: [PATCH] v1/meson.build: explicitly specify the v1 library in
5 pkgconfig
6
7Otherwise there would be '-lmodulemd' which resolves
8to v2 version if both v2 and v1 are present in the sysroot.
9
10Upstream-Status: Pending
11Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
12---
13 modulemd/v1/meson.build | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-)
15
16diff --git a/modulemd/v1/meson.build b/modulemd/v1/meson.build
17index 4d54e69..9144ca2 100644
18--- a/modulemd/v1/meson.build
19+++ b/modulemd/v1/meson.build
20@@ -325,7 +325,7 @@ configure_file(
21 )
22
23 pkg.generate(
24- libraries : modulemd_v1_lib,
25+ libraries : '-l:libmodulemd.so.1',
26 subdirs : v1_header_path,
27 version : libmodulemd_v1_version,
28 name : 'modulemd',
diff --git a/meta/recipes-devtools/libmodulemd/libmodulemd_git.bb b/meta/recipes-devtools/libmodulemd/libmodulemd_git.bb
index d7f486868b..d4ffd281b5 100644
--- a/meta/recipes-devtools/libmodulemd/libmodulemd_git.bb
+++ b/meta/recipes-devtools/libmodulemd/libmodulemd_git.bb
@@ -5,6 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=25a3927bff3ee4f5b21bcb0ed3fcd6bb"
5SRC_URI = "git://github.com/fedora-modularity/libmodulemd;protocol=https \ 5SRC_URI = "git://github.com/fedora-modularity/libmodulemd;protocol=https \
6 file://0001-spec_tmpl.sh-use-bin-sh-not-usr-bin-sh.patch \ 6 file://0001-spec_tmpl.sh-use-bin-sh-not-usr-bin-sh.patch \
7 file://0002-modulemd-v1-meson.build-do-not-generate-gir-or-gtkdo.patch \ 7 file://0002-modulemd-v1-meson.build-do-not-generate-gir-or-gtkdo.patch \
8 file://0001-v1-meson.build-explicitly-specify-the-v1-library-in-.patch \
8 " 9 "
9 10
10PV = "2.4.0" 11PV = "2.4.0"