1
0
mirror of https://git.yoctoproject.org/poky synced 2026-05-31 12:49:46 +00:00

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>
This commit is contained in:
Alexander Kanavin
2019-05-21 18:11:58 +02:00
committed by Richard Purdie
parent 6e013c83bc
commit 9ddfe40619
2 changed files with 29 additions and 0 deletions
@@ -0,0 +1,28 @@
From b651551134cf170038b3e01812e3767969506491 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Tue, 21 May 2019 17:59:26 +0200
Subject: [PATCH] v1/meson.build: explicitly specify the v1 library in
pkgconfig
Otherwise there would be '-lmodulemd' which resolves
to v2 version if both v2 and v1 are present in the sysroot.
Upstream-Status: Pending
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
modulemd/v1/meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/modulemd/v1/meson.build b/modulemd/v1/meson.build
index 4d54e69..9144ca2 100644
--- a/modulemd/v1/meson.build
+++ b/modulemd/v1/meson.build
@@ -325,7 +325,7 @@ configure_file(
)
pkg.generate(
- libraries : modulemd_v1_lib,
+ libraries : '-l:libmodulemd.so.1',
subdirs : v1_header_path,
version : libmodulemd_v1_version,
name : 'modulemd',
@@ -5,6 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=25a3927bff3ee4f5b21bcb0ed3fcd6bb"
SRC_URI = "git://github.com/fedora-modularity/libmodulemd;protocol=https \
file://0001-spec_tmpl.sh-use-bin-sh-not-usr-bin-sh.patch \
file://0002-modulemd-v1-meson.build-do-not-generate-gir-or-gtkdo.patch \
file://0001-v1-meson.build-explicitly-specify-the-v1-library-in-.patch \
"
PV = "2.4.0"