[SCM] pd-cyclone/master: Simplified FLAGS-passing to build-system

zmoelnig-guest at users.alioth.debian.org zmoelnig-guest at users.alioth.debian.org
Mon Dec 9 16:46:47 UTC 2013


The following commit has been merged in the master branch:
commit 9ac3db9ff8eb3853ac28bc69a0308206dd5c9422
Author: IOhannes m zmölnig <zmoelnig at iem.at>
Date:   Mon Dec 9 16:57:09 2013 +0100

    Simplified FLAGS-passing to build-system
    
    don't duplicate flags from upstream build-system, but add to them...
    (requires 'buildflags.patch')

diff --git a/debian/rules b/debian/rules
index e693704..d9f0875 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,14 +21,9 @@ DEB_BUILDDIR = cyclone
 DEB_MAKE_INSTALL_TARGET = DESTDIR=$(CURDIR)/debian/tmp \
 			  prefix=/usr pkglibdir=$(pkglibdir) install
 
-# Upstream build system can't handle explicit CFLAGS, so don't pass them
-# but upstream's build-systems handles WARN_CFLAGS and OPT_CFLAGS
-WARN_CFLAGS=-Wall -W -Wstrict-prototypes -Wno-unused -Wno-parentheses -Wno-switch
-OPT_CFLAGS=-O2 -g -funroll-loops -fomit-frame-pointer -fno-strict-aliasing
-INCLUDES=-I. -I$(CURDIR)/shared -I/usr/include/pd
 DEB_MAKE_EXTRA_ARGS = \
-	CFLAGS="$(WARN_CFLAGS) $(OPT_CFLAGS) -fPIC -DUNIX $(CPPFLAGS) $(INCLUDES) $(CFLAGS)" \
-	LFLAGS="-Wl,--export-dynamic -shared $(LDFLAGS)"
+	EXTRA_CFLAGS="$(CPPFLAGS) -I$(CURDIR)/shared -I/usr/include/pd $(CFLAGS)" \
+	EXTRA_LFLAGS="$(LDFLAGS)"
 
 LIBRARY_NAME = cyclone
 PACKAGE = pd-$(LIBRARY_NAME)

-- 
pd-cyclone packaging



More information about the pkg-multimedia-commits mailing list