[SCM] pd-libdir/master: patched Makefile to build on kFreeBSD and Hurd (Closes: #605830)

eighthave-guest at users.alioth.debian.org eighthave-guest at users.alioth.debian.org
Sun Dec 19 20:22:59 UTC 2010


The following commit has been merged in the master branch:
commit 91983b51e93b4c55e993a2e793fc68e37ffbd95c
Author: Hans-Christoph Steiner <hans at eds.org>
Date:   Sun Dec 19 14:47:40 2010 -0500

    patched Makefile to build on kFreeBSD and Hurd (Closes: #605830)

diff --git a/debian/patches/makefile_update_for_kfreebsd_and_hurd b/debian/patches/makefile_update_for_kfreebsd_and_hurd
new file mode 100644
index 0000000..50af863
--- /dev/null
+++ b/debian/patches/makefile_update_for_kfreebsd_and_hurd
@@ -0,0 +1,82 @@
+Description: updated Makefile to build on kFreeBSD and Hurd
+ This patch takes the upstream template Makefile with new code for handling
+ building using kFreeBSD and Hurd kernels.  This Makefile is already included
+ in the upstream SVN repository, but there is no new release yet.
+
+Author: Hans-Christoph Steiner <hans at eds.org>
+Bug-Debian: http://bugs.debian.org/605828
+Forwarded: not-needed
+Reviewed-By: Hans-Christoph Steiner <hans at eds.org>
+Last-Update: <2010-12-09>
+
+--- pd-libdir-1.9.orig/Makefile
++++ pd-libdir-1.9/Makefile
+@@ -1,4 +1,4 @@
+-## Pd library template version 1.0.3
++## Pd library template version 1.0.6
+ # For instructions on how to use this template, see:
+ #  http://puredata.info/docs/developer/MakefileTemplate
+ LIBRARY_NAME = libdir
+@@ -31,7 +31,8 @@
+ #
+ #------------------------------------------------------------------------------#
+ 
+-CFLAGS = -DPD -I"$(PD_INCLUDE)" -Wall -W -g
++# -I"$(PD_INCLUDE)/pd" supports the header location for 0.43
++CFLAGS = -I"$(PD_INCLUDE)/pd" -Wall -W -g
+ LDFLAGS =  
+ LIBS = 
+ 
+@@ -44,7 +45,7 @@
+ # get library version from meta file
+ LIBRARY_VERSION = $(shell sed -n 's|^\#X text [0-9][0-9]* [0-9][0-9]* VERSION \(.*\);|\1|p' $(LIBRARY_NAME)-meta.pd)
+ 
+-CFLAGS += -DVERSION='"$(LIBRARY_VERSION)"'
++CFLAGS += -DPD -DVERSION='"$(LIBRARY_VERSION)"'
+ 
+ PD_INCLUDE = $(PD_PATH)/include
+ # where to install the library, overridden below depending on platform
+@@ -62,7 +63,7 @@
+ 	         $(SOURCES_iphoneos) $(SOURCES_linux) $(SOURCES_windows)
+ 
+ DISTDIR=$(LIBRARY_NAME)-$(LIBRARY_VERSION)
+-ORIGDIR=pd-$(LIBRARY_NAME)_$(LIBRARY_VERSION)
++ORIGDIR=pd-$(LIBRARY_NAME:~=)_$(LIBRARY_VERSION)
+ 
+ UNAME := $(shell uname -s)
+ ifeq ($(UNAME),Darwin)
+@@ -121,6 +122,34 @@
+   STRIP = strip --strip-unneeded -R .note -R .comment
+   DISTBINDIR=$(DISTDIR)-$(OS)-$(shell uname -m)
+ endif
++ifeq ($(UNAME),GNU)
++  # GNU/Hurd, should work like GNU/Linux for basically all externals
++  CPU := $(shell uname -m)
++  SOURCES += $(SOURCES_linux)
++  EXTENSION = pd_linux
++  OS = linux
++  PD_PATH = /usr
++  OPT_CFLAGS = -O6 -funroll-loops -fomit-frame-pointer
++  CFLAGS += -fPIC
++  LDFLAGS += -Wl,--export-dynamic  -shared -fPIC
++  LIBS += -lc
++  STRIP = strip --strip-unneeded -R .note -R .comment
++  DISTBINDIR=$(DISTDIR)-$(OS)-$(shell uname -m)
++endif
++ifeq ($(UNAME),GNU/kFreeBSD)
++  # Debian GNU/kFreeBSD, should work like GNU/Linux for basically all externals
++  CPU := $(shell uname -m)
++  SOURCES += $(SOURCES_linux)
++  EXTENSION = pd_linux
++  OS = linux
++  PD_PATH = /usr
++  OPT_CFLAGS = -O6 -funroll-loops -fomit-frame-pointer
++  CFLAGS += -fPIC
++  LDFLAGS += -Wl,--export-dynamic  -shared -fPIC
++  LIBS += -lc
++  STRIP = strip --strip-unneeded -R .note -R .comment
++  DISTBINDIR=$(DISTDIR)-$(OS)-$(shell uname -m)
++endif
+ ifeq (CYGWIN,$(findstring CYGWIN,$(UNAME)))
+   CPU := $(shell uname -m)
+   SOURCES += $(SOURCES_cygwin)
diff --git a/debian/patches/series b/debian/patches/series
index 5389e8d..a30215d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 add_required_headers.patch
+makefile_update_for_kfreebsd_and_hurd

-- 
pd-libdir packaging



More information about the pkg-multimedia-commits mailing list