Skip to contentSkip to conversation

package/libid3tag: fix id3tag.pc

PATCH Superseded Fabrice Fontaine 3 participants 5 messages Feb 15, 2019 – Feb 21, 2019

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 package/libid3tag: fix id3tag.pc

Add -lz to id3tag.pc, this fix is needed to be able to use pkg-config in madplay to find id3tag dependencies

---
 package/libid3tag/id3tag.pc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/libid3tag/id3tag.pc +1 -1
index 845eb3276b..c8b248766c 100644
@@ -7,5 +7,5 @@ Name: id3tag
 Description: ID3 tag reading library
 Version: 0.15.1b
 Requires:
-Libs: -L${libdir} -lid3tag
+Libs: -L${libdir} -lid3tag -lz
 Cflags: -I${includedir}
Signature · 1 line
2.14.1
#1 lore raw

PATCH 2/2 package/madplay: fix static build

Add a patch to use pkg-config to find id3tag dependency (-lz)

Fixes:
- http://autobuild.buildroot.org/results/5e4882ddacf205a92a3ff1e79649cf16e4b6c0ae

---
 ...onfigure-ac-use-pkg-config-to-find-id3tag.patch | 23 ++++++++++++++++++++++
 package/madplay/madplay.mk                         |  4 ++--
 2 files changed, 25 insertions(+), 2 deletions(-)
 create mode 100644 package/madplay/0003-configure-ac-use-pkg-config-to-find-id3tag.patch
package/madplay/0003-configure-ac-use-pkg-config-to-find-id3tag.patch new file +23 -0
new file mode 100644
index 0000000000..47645edd4c
@@ -0,0 +1,23 @@
+configure.ac: use pkg-config to find id3tag
+
+Signed-off-by: Fabrice Fontaine <[email protected]>
+
+diff -durN madplay-0.15.2b-orig/configure.ac madplay-0.15.2b/configure.ac
+--- madplay-0.15.2b-orig/configure.ac	2019-02-14 21:34:01.507212449 +0100
++++ madplay-0.15.2b/configure.ac	2019-02-15 23:24:00.079876087 +0100
+@@ -182,12 +182,13 @@
+ *** environment variable to specify its installed location, e.g. -L<dir>.])
+ ])
+ 
+-AC_CHECK_LIB(id3tag, id3_tag_parse, :, [
++PKG_CHECK_MODULES(ID3TAG, id3tag, [
++	CFLAGS="$CFLAGS $ID3TAG_CFLAGS" LIBS="$LIBS $ID3TAG_LIBS"], [
+ 	AC_MSG_ERROR([libid3tag was not found
+ *** You must first install libid3tag before you can build this package.
+ *** If libid3tag is already installed, you may need to use the LDFLAGS
+ *** environment variable to specify its installed location, e.g. -L<dir>.])
+-], [-lz])
++])
+ 
+ AC_FUNC_VPRINTF
+ AC_CHECK_FUNCS(madvise localeconv)
package/madplay/madplay.mk +2 -2
index dd54e2e78f..4d32a9ad30 100644
@@ -8,7 +8,7 @@ MADPLAY_VERSION = 0.15.2b
 MADPLAY_SITE = http://downloads.sourceforge.net/project/mad/madplay/$(MADPLAY_VERSION)
 MADPLAY_LICENSE = GPL-2.0+
 MADPLAY_LICENSE_FILES = COPYING COPYRIGHT
-MADPLAY_DEPENDENCIES = libmad libid3tag $(TARGET_NLS_DEPENDENCIES)
+MADPLAY_DEPENDENCIES = host-pkgconf libmad libid3tag $(TARGET_NLS_DEPENDENCIES)
 
 # Force autoreconf to be able to use a more recent libtool script, that
 # is able to properly behave in the face of a missing C++ compiler.
@@ -18,7 +18,7 @@ MADPLAY_AUTORECONF = YES
 # ./configure can find alsa-lib.
 ifeq ($(BR2_PACKAGE_MADPLAY_ALSA),y)
 MADPLAY_CONF_OPTS += --with-alsa
-MADPLAY_DEPENDENCIES += host-pkgconf alsa-lib
+MADPLAY_DEPENDENCIES += alsa-lib
 MADPLAY_CONF_ENV += LIBS="`$(PKG_CONFIG_HOST_BINARY) --libs alsa`"
 endif
 
Signature · 1 line
2.14.1
#2 lore raw

PATCH 2/2 package/madplay: fix static build

Quoted 7 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Fabrice" == Fabrice Fontaine <[email protected]> writes:

Add a patch to use pkg-config to find id3tag dependency (-lz)
Fixes:
- http://autobuild.buildroot.org/results/5e4882ddacf205a92a3ff1e79649cf16e4b6c0ae

Committed to 2018.02.x and 2018.11.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#3 lore raw

PATCH 1/2 package/libid3tag: fix id3tag.pc

In reply to Fabrice Fontaine

Hello Fabrice,

Quoted 13 lines · On Fri, 15 Feb 2019 23:42:06 +0100 Fabrice Fontaine…

Add -lz to id3tag.pc, this fix is needed to be able to use pkg-config in madplay to find id3tag dependencies

---
 package/libid3tag/id3tag.pc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/libid3tag/id3tag.pc +0 -0
index 845eb3276b..c8b248766c 100644

package/libid3tag/id3tag.pc Name: id3tag · line 10

Quoted 5 lines
package/libid3tag/id3tag.pc +1 -1
@@ -7,5 +7,5 @@ Name: id3tag
 Description: ID3 tag reading library
 Version: 0.15.1b
 Requires:
-Libs: -L${libdir} -lid3tag
+Libs: -L${libdir} -lid3tag -lz

Is it libid3tag that links against libz ?

If that's the case, then this fix is not the most correct one. It should instead be:

Libs: -L${libdir} -lid3tag
Libs.private: -lz

Thanks to this, it's only in static linking configurations that pkg-config --libs id3tag will return -lz, which is what we want: in dynamic linking configurations, we don't want users of the libid3tag library to directly link with libz, as it is not necessary.

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com