Skip to contentSkip to conversation

libmodulemd: fix erroneous linking against v2 library when v1 was requested

PATCH In review Alexander Kanavin 3 participants 6 messages May 21, 2019 – May 22, 2019 Arm/Amlogic Meson SoC support

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 libmodulemd: fix erroneous linking against v2 library when v1 was requested

---
 ...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
meta/recipes-devtools/libmodulemd/libmodulemd/0001-v1-meson.build-explicitly-specify-the-v1-library-in-.patch new file +28 -0
new file mode 100644
index 00000000000..1568d25f9d8
@@ -0,0 +1,28 @@
+From b651551134cf170038b3e01812e3767969506491 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <[email protected]>
+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 <[email protected]>
+---
+ 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',
meta/recipes-devtools/libmodulemd/libmodulemd_git.bb +1 -0
index d7f486868b8..d4ffd281b5f 100644
@@ -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"
Signature · 1 line
2.17.1
#1 lore raw
Quoted 29 lines · Alexander Kanavin
---
 ...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
meta/recipes-devtools/libmodulemd/libmodulemd/0001-v1-meson.build-explicitly-specify-the-v1-library-in-.patch new file +15 -0
new file mode 100644
index 00000000000..1568d25f9d8
@@ -0,0 +1,28 @@
+From b651551134cf170038b3e01812e3767969506491 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <[email protected]>
+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 <[email protected]>
+---
+ modulemd/v1/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+

meta/recipes-devtools/libmodulemd/libmodulemd/0001-v1-meson.build-explicitly-specify-the-v1-library-in-.patch line 25

Quoted 10 lines
meta/recipes-devtools/libmodulemd/libmodulemd/0001-v1-meson.build-explicitly-specify-the-v1-library-in-.patch new file +10 -0
+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 ?

Quoted 23 lines
meta/recipes-devtools/libmodulemd/libmodulemd/0001-v1-meson.build-explicitly-specify-the-v1-library-in-.patch new file +3 -0
+     subdirs : v1_header_path,
+     version : libmodulemd_v1_version,
+     name : 'modulemd',
meta/recipes-devtools/libmodulemd/libmodulemd_git.bb +1 -1
index d7f486868b8..d4ffd281b5f 100644
@@ -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
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

#2 lore raw
Quoted 8 lines · Khem Raj
Quoted 4 lines

+
+ 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 ?

The problem is that both v2 and v1 are installed into the sysroot; we don't have a mechanism to choose one or the other via DEPENDS (unlike desktop distros where you can install -v1-dev or -v2-dev package for your build).
Then both v2 and v1 .pc files (without this patch) refer to '-lmodulemd' which in our case always resolves to v2 library.

Wth the patch the generated v1 .pc will look like this, while v2 continues to use the original '-lmodlulemd' in Libs:

prefix=${pcfiledir}/../../../usr
libdir=${prefix}/lib
includedir=${prefix}/include

Name: modulemd
Description: Module metadata manipulation library
Version: 1.8.10
Requires: glib-2.0, gobject-2.0
Libs: -l:libmodulemd.so.1
Cflags: -I${includedir}/modulemd

Alex

#3 lore raw
Quoted 24 lines · Alexander Kanavin
Quoted 8 lines · Khem Raj
Quoted 4 lines

+
+ 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 ?

The problem is that both v2 and v1 are installed into the sysroot; we don't have a mechanism to choose one or the other via DEPENDS (unlike desktop distros where you can install -v1-dev or -v2-dev package for your build).
Then both v2 and v1 .pc files (without this patch) refer to '-lmodulemd' which in our case always resolves to v2 library.

Wth the patch the generated v1 .pc will look like this, while v2 continues to use the original '-lmodlulemd' in Libs:

prefix=${pcfiledir}/../../../usr
libdir=${prefix}/lib
includedir=${prefix}/include

Quoted 6 lines

Name: modulemd
Description: Module metadata manipulation library
Version: 1.8.10
Requires: glib-2.0, gobject-2.0
Libs: -l:libmodulemd.so.1
Cflags: -I${includedir}/modulemd

FWIW I think if there were two different recipes we could select which was in the sysroot through DEPENDS?

Cheers,

Richard

#4 lore raw

I'm not sure that would work, as at do_rootfs time both createrepo_c (v2 user) and libdnf (v1 user) need to be present in the sysroot-native, and so v1 and v2 files would clash at that point (libmodulemd.so would be provided by both).

I am kind of hoping that libdnf would migrate off v1 to v2, and we could then simply disable v1 altogether. So far it hasn't happened, and libdnf update is now also blocked by the c++ code that older compilers don't like, so I'd leave thing as they are for now.

Alex

Quoted 40 lines · Richard Purdie
Quoted 24 lines · Alexander Kanavin
Quoted 8 lines · Khem Raj
Quoted 4 lines

+
+ 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 ?

The problem is that both v2 and v1 are installed into the sysroot; we don't have a mechanism to choose one or the other via DEPENDS (unlike desktop distros where you can install -v1-dev or -v2-dev package for your build).
Then both v2 and v1 .pc files (without this patch) refer to '-lmodulemd' which in our case always resolves to v2 library.

Wth the patch the generated v1 .pc will look like this, while v2 continues to use the original '-lmodlulemd' in Libs:

prefix=${pcfiledir}/../../../usr
libdir=${prefix}/lib
includedir=${prefix}/include

Quoted 6 lines

Name: modulemd
Description: Module metadata manipulation library
Version: 1.8.10
Requires: glib-2.0, gobject-2.0
Libs: -l:libmodulemd.so.1
Cflags: -I${includedir}/modulemd

FWIW I think if there were two different recipes we could select which was in the sysroot through DEPENDS?

Cheers,

Richard

#5 lore raw
Quoted 11 lines · Alexander Kanavin

I'm not sure that would work, as at do_rootfs time both createrepo_c (v2 user) and libdnf (v1 user) need to be present in the sysroot-native, and so v1 and v2 files would clash at that point (libmodulemd.so would be provided by both).

I am kind of hoping that libdnf would migrate off v1 to v2, and we could then simply disable v1 altogether. So far it hasn't happened, and libdnf update is now also blocked by the c++ code that older compilers don't like, so I'd leave thing as they are for now.

conflicts will happen only when dev packages
are bundled into image.

we probably need something like libusb for this case and then remove the compat package when its
no longer needed.

Quoted 45 lines

Alex

Quoted 40 lines · Richard Purdie
Quoted 24 lines · Alexander Kanavin
Quoted 8 lines · Khem Raj
Quoted 4 lines

+
+ 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 ?

The problem is that both v2 and v1 are installed into the sysroot; we don't have a mechanism to choose one or the other via DEPENDS (unlike desktop distros where you can install -v1-dev or -v2-dev package for your build).
Then both v2 and v1 .pc files (without this patch) refer to '-lmodulemd' which in our case always resolves to v2 library.

Wth the patch the generated v1 .pc will look like this, while v2 continues to use the original '-lmodlulemd' in Libs:

prefix=${pcfiledir}/../../../usr
libdir=${prefix}/lib
includedir=${prefix}/include

Quoted 6 lines

Name: modulemd
Description: Module metadata manipulation library
Version: 1.8.10
Requires: glib-2.0, gobject-2.0
Libs: -l:libmodulemd.so.1
Cflags: -I${includedir}/modulemd

FWIW I think if there were two different recipes we could select which was in the sysroot through DEPENDS?

Cheers,

Richard