[SCM] pd-iemutils/master: Fix upstream makefile to allow hardening patches
umlaeute at users.alioth.debian.org
umlaeute at users.alioth.debian.org
Mon Dec 7 17:33:29 UTC 2015
The following commit has been merged in the master branch:
commit d7d296dcd0ac4b26e75baac45fe7d3e3c8963789
Author: IOhannes m zmölnig <zmoelnig at umlautQ.umlaeute.mur.at>
Date: Mon Dec 7 18:31:39 2015 +0100
Fix upstream makefile to allow hardening patches
diff --git a/debian/patches/makefile.patch b/debian/patches/makefile.patch
new file mode 100644
index 0000000..db7606d
--- /dev/null
+++ b/debian/patches/makefile.patch
@@ -0,0 +1,60 @@
+Description: fixes for makefiles to allow adding CFLAGS
+Author: IOhannes zmölnig
+Last-Update: 2015-12-07
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- pd-iemutils.orig/iem_adaptfilt/src/makefile_lin
++++ pd-iemutils/iem_adaptfilt/src/makefile_lin
+@@ -5,7 +5,7 @@
+ INCLUDE = -I. -I/usr/local/src/pd/src
+
+ LDFLAGS = -export-dynamic -shared
+-LIB = -ldl -lm -lpthread
++LIB =
+
+ #select either the DBG and OPT compiler flags below:
+
+@@ -34,18 +34,15 @@
+ #
+
+ clean:
+- rm ../../lib/$(TARGET)
+- rm *.o
++ -rm -f ../../lib/$(TARGET) $(TARGET)
++ -rm -f *.o
+
+ all: $(OBJ)
+ @echo :: $(OBJ)
+- ld $(LDFLAGS) -o $(TARGET) *.o $(LIB)
+- strip --strip-unneeded $(TARGET)
+- rm *.o
++ $(CC) $(LDFLAGS) -o $(TARGET) *.o $(LIB)
+
+ $(OBJ) : %.o : %.c
+- touch $*.c
+- cc $(CFLAGS) $(INCLUDE) -c -o $*.o $*.c
++ $(CC) $(CFLAGS) $(INCLUDE) -c -o $*.o $*.c
+
+
+
+--- pd-iemutils.orig/Makefile
++++ pd-iemutils/Makefile
+@@ -8,6 +8,9 @@
+ version=-v0.0.$(shell date +%Y%m%d)
+ archivefile=$(library)$(version).tgz
+
++CFLAGS=-DPD -fPIC
++LDFLAGS=--export-dynamic -fPIC -shared
++
+ clean:
+ -find . -name "*.o" -delete
+ -find . -name "*.pd_*" -delete
+@@ -25,7 +28,6 @@
+
+ iem_adaptfilt:
+ make -C iem_adaptfilt/src -f makefile_lin \
+- CFLAGS="-DPD -fPIC" \
+- LDFLAGS="--export-dynamic -fPIC -shared"
++ CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"
+ iem_dp iem_roomsim iem_spec2 iem_tab:
+ make -C $@/src -f makefile_linux
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..82374e5
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+makefile.patch
--
pd-iemutils packaging
More information about the pkg-multimedia-commits
mailing list