[SCM] gxtuner/master: Fix linking order.
alessio at users.alioth.debian.org
alessio at users.alioth.debian.org
Tue Jul 26 07:55:45 UTC 2011
The following commit has been merged in the master branch:
commit b1e130ebea42644f5191d5264596c1ffe3cc5756
Author: Alessio Treglia <alessio at debian.org>
Date: Tue Jul 26 09:56:15 2011 +0200
Fix linking order.
diff --git a/debian/patches/0001-makefile.patch b/debian/patches/0001-makefile.patch
index f6a4312..f80d407 100644
--- a/debian/patches/0001-makefile.patch
+++ b/debian/patches/0001-makefile.patch
@@ -2,17 +2,22 @@ Description: Removed "-march-native" gcc option
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Forwarded: no
---
- Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ Makefile | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
--- gxtuner.orig/Makefile
+++ gxtuner/Makefile
-@@ -9,7 +9,7 @@
+@@ -6,10 +6,12 @@
+ SHARE_DIR = $(PREFIX)/share
+ DESKAPPS_DIR = $(SHARE_DIR)/applications
+ PIXMAPS_DIR = $(SHARE_DIR)/pixmaps
++ LIBS = `pkg-config --libs jack gtk+-2.0 gthread-2.0 fftw3f` -lzita-resampler
++ CFLAGS += -Wall -ffast-math `pkg-config --cflags jack gtk+-2.0 gthread-2.0 fftw3f`
all :
echo '#define PIXMAPS_DIR "$(PIXMAPS_DIR)"' > config.h
- $(CXX) -O2 -Wall -march=native -ffast-math -lzita-resampler `pkg-config --cflags --libs jack gtk+-2.0 gthread-2.0 fftw3f` gxtuner.cpp -o gxtuner
-+ $(CXX) -O3 -Wall -ffast-math -lzita-resampler `pkg-config --cflags --libs jack gtk+-2.0 gthread-2.0 fftw3f` gxtuner.cpp -o gxtuner
++ $(CXX) $(LDFLAGS) $(CFLAGS) gxtuner.cpp $(LIBS) -o gxtuner
install:
install gxtuner $(DESTDIR)$(BIN_DIR)
--
gxtuner packaging
More information about the pkg-multimedia-commits
mailing list