Brad Bishop | 15ae250 | 2019-06-18 21:44:24 -0400 | [diff] [blame^] | 1 | From b651551134cf170038b3e01812e3767969506491 Mon Sep 17 00:00:00 2001 |
| 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
| 3 | Date: Tue, 21 May 2019 17:59:26 +0200 |
| 4 | Subject: [PATCH] v1/meson.build: explicitly specify the v1 library in |
| 5 | pkgconfig |
| 6 | |
| 7 | Otherwise there would be '-lmodulemd' which resolves |
| 8 | to v2 version if both v2 and v1 are present in the sysroot. |
| 9 | |
| 10 | Upstream-Status: Pending |
| 11 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
| 12 | --- |
| 13 | modulemd/v1/meson.build | 2 +- |
| 14 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 15 | |
| 16 | diff --git a/modulemd/v1/meson.build b/modulemd/v1/meson.build |
| 17 | index 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', |