From e3ceda0456ddbbb5187d13541740e7eac6b3cc22 Mon Sep 17 00:00:00 2001 From: Rodolfo Garcia Date: Mon, 19 Sep 2011 15:35:10 +0200 Subject: [PATCH] Fix FTBFS with ld --as-needed Patch sent by Angel Abad --- wmmixer/CHANGES | 3 +++ wmmixer/Makefile | 4 ++-- wmmixer/debian/changelog | 8 ++++++++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/wmmixer/CHANGES b/wmmixer/CHANGES index cd05006..d0cc90c 100644 --- a/wmmixer/CHANGES +++ b/wmmixer/CHANGES @@ -90,3 +90,6 @@ Release 1.6 13 Jul 2011 Support of multiple config files to run multiple 02_multiple_config_files.patch 03_hurd_support.patch 04_xclass_support.patch + +Release 1.7 19 Sep 2011 Fix FTBFS with ld --as-needed + Patch sent by Angel Abad diff --git a/wmmixer/Makefile b/wmmixer/Makefile index 47cef3d..dd61730 100644 --- a/wmmixer/Makefile +++ b/wmmixer/Makefile @@ -13,7 +13,7 @@ EXTRA_LIBS = -L/usr/X11R6/lib -lX11 -lXpm -lXext LD = g++ -LDFLAGS = -o $(EXECUTABLE) $(EXTRA_LIBDIRS) $(EXTRA_LIBS) $(CXXFLAGS) +LDFLAGS = -o $(EXECUTABLE) $(CXXFLAGS) EXECUTABLE = wmmixer OBJS = xhandler.o mixctl.o wmmixer.o exception.o @@ -26,7 +26,7 @@ INSTALL_PROGRAM = $(INSTALL) -D -p -o root -g root -m 755 $(CXX) $(CXXFLAGS) -c -o $@ $< $(EXECUTABLE): $(OBJS) - $(LD) $(LDFLAGS) $(OBJS) + $(LD) $(LDFLAGS) $(OBJS) $(EXTRA_LIBDIRS) $(EXTRA_LIBS) all: $(EXECUTABLE) diff --git a/wmmixer/debian/changelog b/wmmixer/debian/changelog index 73d4166..e869521 100644 --- a/wmmixer/debian/changelog +++ b/wmmixer/debian/changelog @@ -1,3 +1,11 @@ +wmmixer (1.7-1) unstable; urgency=low + + * New upstream version 1.7 + - Fix FTBFS with ld --as-needed + Patch sent by Angel Abad [Closes: #640301] + + -- Rodolfo García Peñas (kix) Mon, 19 Sep 2011 15:29:32 +0200 + wmmixer (1.6-2) unstable; urgency=low * debian/copyright is now DEP-5