Package: zomg
Version: 0.8-2
Followup-For: Bug #925868
User: [email protected]
Usertags: origin-ubuntu eoan ubuntu-patch
In Ubuntu, the attached patch was applied to achieve the following:
- debian/patches/linking_order.patch: Use LDADD instead of LDFLAGS to fix
linking issue with ld --as-needed.
It appears we fixed this back in 2014 (ugh) and then entirely failed to
push it back upstream. Sorry about that. The gcc-9 failure looks like
an --as-needed link order issue to me, so this patch almost certainly
fixes it.
As a bonus, if you fix #845584 at the same time, we can drop the entire
Ubuntu delta and get back in sync (yay).
... Adam
-- System Information:
Debian Release: buster/sid
APT prefers eoan
APT policy: (500, 'eoan')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 5.0.0-13-lowlatency (SMP w/4 CPU cores; PREEMPT)
Kernel taint flags: TAINT_WARN, TAINT_OOT_MODULE
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8),
LANGUAGE=en_CA:en (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru zomg-0.8/debian/patches/linking_order.patch
zomg-0.8/debian/patches/linking_order.patch
--- zomg-0.8/debian/patches/linking_order.patch 1969-12-31 17:00:00.000000000
-0700
+++ zomg-0.8/debian/patches/linking_order.patch 2015-06-25 00:33:27.000000000
-0600
@@ -0,0 +1,52 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -11,10 +11,10 @@
+
+ zomghelper_SOURCES = zomghelper.c
+ zomghelper_CFLAGS = $(opusfile_CFLAGS) $(vorbisfile_CFLAGS)
+-zomghelper_LDFLAGS = $(opusfile_LIBS) $(vorbisfile_LIBS)
++zomghelper_LDADD = $(opusfile_LIBS) $(vorbisfile_LIBS)
+ zomghelper_xspf_SOURCES = zomghelper-xspf.c
+ zomghelper_xspf_CFLAGS = $(CFLAGS) $(libxml_CFLAGS)
+-zomghelper_xspf_LDFLAGS = $(LDFLAGS) $(libxml_LIBS)
++zomghelper_xspf_LDADD = $(libxml_LIBS)
+
+ dist_man_MANS = zomg.1 zomghelper.1
+
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -99,15 +99,16 @@
+ PROGRAMS = $(bin_PROGRAMS) $(libexec_PROGRAMS)
+ am_zomghelper_OBJECTS = zomghelper-zomghelper.$(OBJEXT)
+ zomghelper_OBJECTS = $(am_zomghelper_OBJECTS)
+-zomghelper_LDADD = $(LDADD)
+-zomghelper_LINK = $(CCLD) $(zomghelper_CFLAGS) $(CFLAGS) \
+- $(zomghelper_LDFLAGS) $(LDFLAGS) -o $@
++am__DEPENDENCIES_1 =
++zomghelper_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
++zomghelper_LINK = $(CCLD) $(zomghelper_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
++ $(LDFLAGS) -o $@
+ am_zomghelper_xspf_OBJECTS = \
+ zomghelper_xspf-zomghelper-xspf.$(OBJEXT)
+ zomghelper_xspf_OBJECTS = $(am_zomghelper_xspf_OBJECTS)
+-zomghelper_xspf_LDADD = $(LDADD)
++zomghelper_xspf_DEPENDENCIES = $(am__DEPENDENCIES_1)
+ zomghelper_xspf_LINK = $(CCLD) $(zomghelper_xspf_CFLAGS) $(CFLAGS) \
+- $(zomghelper_xspf_LDFLAGS) $(LDFLAGS) -o $@
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+ am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+@@ -318,10 +319,10 @@
+ pkgdata_DATA = audioscrobbler caching lastfmradio parsemedium screenoutput
shuffle urlparse
+ zomghelper_SOURCES = zomghelper.c
+ zomghelper_CFLAGS = $(opusfile_CFLAGS) $(vorbisfile_CFLAGS)
+-zomghelper_LDFLAGS = $(opusfile_LIBS) $(vorbisfile_LIBS)
++zomghelper_LDADD = $(opusfile_LIBS) $(vorbisfile_LIBS)
+ zomghelper_xspf_SOURCES = zomghelper-xspf.c
+ zomghelper_xspf_CFLAGS = $(CFLAGS) $(libxml_CFLAGS)
+-zomghelper_xspf_LDFLAGS = $(LDFLAGS) $(libxml_LIBS)
++zomghelper_xspf_LDADD = $(libxml_LIBS)
+ dist_man_MANS = zomg.1 zomghelper.1
+ edit = sed \
+ -e 's,@DEFAULT_HANDSHAKE_SERVER@,$(ZOMG_DEFAULT_HANDSHAKE_SERVER),g' \
diff -Nru zomg-0.8/debian/patches/series zomg-0.8/debian/patches/series
--- zomg-0.8/debian/patches/series 1969-12-31 17:00:00.000000000 -0700
+++ zomg-0.8/debian/patches/series 2015-06-25 00:33:27.000000000 -0600
@@ -0,0 +1 @@
+linking_order.patch
