On Tue, May 21, 2019 at 9:12 AM Alexander Kanavin <alex.kana...@gmail.com> wrote: > > Signed-off-by: Alexander Kanavin <alex.kana...@gmail.com> > --- > ...xplicitly-specify-the-v1-library-in-.patch | 28 +++++++++++++++++++ > .../libmodulemd/libmodulemd_git.bb | 1 + > 2 files changed, 29 insertions(+) > create mode 100644 > meta/recipes-devtools/libmodulemd/libmodulemd/0001-v1-meson.build-explicitly-specify-the-v1-library-in-.patch > > 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 00000000000..1568d25f9d8 > --- /dev/null > +++ > b/meta/recipes-devtools/libmodulemd/libmodulemd/0001-v1-meson.build-explicitly-specify-the-v1-library-in-.patch > @@ -0,0 +1,28 @@ > +From b651551134cf170038b3e01812e3767969506491 Mon Sep 17 00:00:00 2001 > +From: Alexander Kanavin <alex.kana...@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.kana...@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',
shouldn't it be generating a separate package for v1 ? hardcoding linker paths seems a bit hackish here, is it going to generate a .pc file with .so.1 version ? > + subdirs : v1_header_path, > + version : libmodulemd_v1_version, > + name : 'modulemd', > diff --git a/meta/recipes-devtools/libmodulemd/libmodulemd_git.bb > b/meta/recipes-devtools/libmodulemd/libmodulemd_git.bb > index d7f486868b8..d4ffd281b5f 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" > 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" > -- > 2.17.1 > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core