[SCM] portmidi/master: Add patch to handle multiarch and inherit {C{, PP}LD}FLAGS from the environment.

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Thu Oct 16 14:14:14 UTC 2014


The following commit has been merged in the master branch:
commit 712a8271e4a6e3223ed51df42ddbeb742363c91a
Author: Alessio Treglia <alessio at debian.org>
Date:   Thu Oct 16 12:50:45 2014 +0100

    Add patch to handle multiarch and inherit {C{,PP}LD}FLAGS from the environment.

diff --git a/debian/patches/13-multiarch_et_hardening.patch b/debian/patches/13-multiarch_et_hardening.patch
new file mode 100644
index 0000000..855961f
--- /dev/null
+++ b/debian/patches/13-multiarch_et_hardening.patch
@@ -0,0 +1,36 @@
+---
+ pm_linux/Makefile |   10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
+
+--- portmidi.orig/pm_linux/Makefile
++++ portmidi/pm_linux/Makefile
+@@ -30,13 +30,15 @@ VFLAGS = -DPMALSA
+ # ALSALIB = 
+ # VFLAGS = -DPMNULL
+ 
++LIBDIR ?= lib
++
+ pmlib = pm_linux/libportmidi.a
+ pmslib = pm_linux/libportmidi.so.0.0.0
+ 
+ ptlib = porttime/libporttime.a
+ ptslib = porttime/libporttime.so.0.0.0
+ 
+-CC = gcc $(CFLAGS) $(VFLAGS) $(PMFLAGS) -g -Ipm_common -Iporttime
++CC = gcc $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $(VFLAGS) $(PMFLAGS) -g -Ipm_common -Iporttime
+ 
+ INSTALL = install
+ 
+@@ -173,9 +175,9 @@ install:
+ 	$(INSTALL) -d $(DESTDIR)/usr/include/
+ 	$(INSTALL) -m 644 pm_common/portmidi.h $(DESTDIR)/usr/include/
+ 	$(INSTALL) -m 644 porttime/porttime.h $(DESTDIR)/usr/include/
+-	$(INSTALL) -d $(DESTDIR)/usr/lib/
+-	$(INSTALL) -m 644 pm_linux/libportmidi* $(DESTDIR)/usr/lib/
+-	$(INSTALL) -m 644 porttime/libporttime* $(DESTDIR)/usr/lib/
++	$(INSTALL) -d $(DESTDIR)/usr/$(LIBDIR)/
++	$(INSTALL) -m 644 pm_linux/libportmidi* $(DESTDIR)/usr/$(LIBDIR)/
++	$(INSTALL) -m 644 porttime/libporttime* $(DESTDIR)/usr/$(LIBDIR)/
+ 
+ clean:
+ 	rm -f *.o *~ core* */*.o */*.so */*~ */core* pm_test/*/pm_dll.dll 

-- 
portmidi packaging



More information about the pkg-multimedia-commits mailing list