[SCM] pd-cyclone/master: add new HURD/kFreeBSD fixes and consolidate them into a single patch

Mon Jan 2 07:20:59 UTC 2012

The following commit has been merged in the master branch:
commit c454c2d2a6d1344a79794f205fdc6088368d76ca
Author: Hans-Christoph Steiner <hans at eds.org>
Date:   Mon Jan 2 02:01:16 2012 -0500

    add new HURD/kFreeBSD fixes and consolidate them into a single patch

diff --git a/debian/patches/update-makefile-for-hurd-and-kfreebsd b/debian/patches/fix-hurd-and-kfreebsd
similarity index 65%
rename from debian/patches/update-makefile-for-hurd-and-kfreebsd
rename to debian/patches/fix-hurd-and-kfreebsd
index caedbbc..27fc641 100644
--- a/debian/patches/update-makefile-for-hurd-and-kfreebsd
+++ b/debian/patches/fix-hurd-and-kfreebsd
@@ -1,16 +1,100 @@
-Description: updated Makefile to fix HURD and kFreeBSD builds
- This patch is generated from the upstream updated Makefile.
+Description: took fixes for HURD and kFreeBSD from upstream
 Author: Hans-Christoph Steiner <hans at eds.org>
 Forwarded: not-needed
 Last-Update: <2011-12-31>
 
+--- pd-cyclone-0.1~alpha55.orig/Makefile.common
++++ pd-cyclone-0.1~alpha55/Makefile.common
+@@ -2,6 +2,15 @@
+ PD_DIR ?= $(ROOT_DIR)/../../pd/src
+ 
+ OS_NAME = $(shell uname -s)
++
++# Debian has options for the GNU HURD and kFreeBSD kernels
++ifeq ($(OS_NAME),GNU)
++  OS_NAME=Linux
++endif
++ifeq ($(OS_NAME),GNU/kFreeBSD)
++  OS_NAME=Linux
++endif
++
+ ifneq ($(OS_NAME),Linux)
+ ifneq ($(OS_NAME),Darwin)
+ ifeq (,$(findstring MinGW,$(OS_NAME)))
+--- pd-cyclone-0.1~alpha55/shared/unstable/loader.c	2012/01/01 19:37:29	15861
++++ pd-cyclone-0.1~alpha55/shared/unstable/loader.c	2012/01/02 06:34:02	15862
+@@ -5,7 +5,8 @@
+ /* This is just a not-yet-in-the-API-sys_load_lib() duplication
+    (modulo differentiating the error return codes).  LATER use the original. */
+ 
+-#ifdef __linux__
++/* this is for GNU/Linux and also Debian GNU/Hurd and GNU/kFreeBSD */
++#if defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__GNU__) || defined(__GLIBC__)
+ #include <dlfcn.h>
+ #endif
+ #ifdef UNIX
+@@ -39,7 +40,8 @@
+     ".pd_irix5";
+ #endif
+ #endif
+-#ifdef __linux__
++/* this is for GNU/Linux and also Debian GNU/Hurd and GNU/kFreeBSD */
++#if defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__GNU__) || defined(__GLIBC__)
+     ".pd_linux";
+ #endif
+ #ifdef MACOSX
+@@ -76,7 +78,8 @@
+ 	strcpy(symname + (strlen(symname) - 1), "_tilde");
+     /* and append _setup to form the C setup function name */
+     strcat(symname, "_setup");
+-#ifdef __linux__
++/* this is for GNU/Linux and also Debian GNU/Hurd and GNU/kFreeBSD */
++#if defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__GNU__) || defined(__GLIBC__)
+     dlobj = dlopen(filename, RTLD_NOW | RTLD_GLOBAL);
+     if (!dlobj)
+     {
+--- pd-cyclone-0.1~alpha55/shared/common/mifi.c	2012/01/01 19:37:29	15861
++++ pd-cyclone-0.1~alpha55/shared/common/mifi.c	2012/01/02 06:34:02	15862
+@@ -15,7 +15,8 @@
+ #include "m_pd.h"
+ #include "mifi.h"
+ 
+-#ifdef __linux__
++/* this is for GNU/Linux and also Debian GNU/Hurd and GNU/kFreeBSD */
++#if defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__GNU__) || defined(__GLIBC__)
+ #include <sys/types.h>
+ #ifndef uint32
+ typedef u_int32_t uint32;
+--- pd-cyclone-0.1~alpha55/shared/shared.h	2012/01/01 19:37:29	15861
++++ pd-cyclone-0.1~alpha55/shared/shared.h	2012/01/02 06:34:02	15862
+@@ -25,7 +25,8 @@
+ 
+ typedef unsigned long shared_t_bitmask;
+ 
+-#ifdef __linux__
++/* this is for GNU/Linux and also Debian GNU/Hurd and GNU/kFreeBSD */
++#if defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__GNU__) || defined(__GLIBC__)
+ #include <sys/types.h>
+ #ifndef int32
+ typedef int32_t int32;
 --- pd-cyclone-0.1~alpha55.orig/cyclone/Makefile.libdir
 +++ pd-cyclone-0.1~alpha55/cyclone/Makefile.libdir
-@@ -58,12 +58,37 @@ ifeq ($(UNAME),Linux)
+@@ -41,7 +41,7 @@ ifeq ($(UNAME),Darwin)
+     else
+       FAT_FLAGS = -arch ppc -arch i386 -arch x86_64 -mmacosx-version-min=10.4
+     endif
+-    CFLAGS += $(FAT_FLAGS) -fPIC -I/sw/include
++    CFLAGS += -DUNIX $(FAT_FLAGS) -fPIC -I/sw/include
+     LDFLAGS += $(FAT_FLAGS) -bundle -undefined dynamic_lookup -L/sw/lib
+     # if the 'pd' binary exists, check the linking against it to aid with stripping
+     LDFLAGS += $(shell test -e $(PD_PATH)/bin/pd && echo -bundle_loader $(PD_PATH)/bin/pd)
+@@ -57,24 +57,50 @@ ifeq ($(UNAME),Linux)
+   OS = linux
    PD_PATH = /usr
    OPT_CFLAGS = -O6 -funroll-loops -fomit-frame-pointer
-   CFLAGS += -fPIC
+-  CFLAGS += -fPIC
 -  LDFLAGS += -Wl,--export-dynamic  -shared -fPIC
++  CFLAGS += -DUNIX -fPIC
 +  LDFLAGS += -rdynamic -shared -fPIC
 +  LIBS += -lc
 +  STRIP = strip --strip-unneeded -R .note -R .comment
@@ -22,7 +106,7 @@ Last-Update: <2011-12-31>
 +  OS = linux
 +  PD_PATH = /usr
 +  OPT_CFLAGS = -O6 -funroll-loops -fomit-frame-pointer
-+  CFLAGS += -fPIC
++  CFLAGS += -DUNIX -fPIC
 +  LDFLAGS += -rdynamic -shared -fPIC
 +  LIBS += -lc
 +  STRIP = strip --strip-unneeded -R .note -R .comment
@@ -34,7 +118,7 @@ Last-Update: <2011-12-31>
 +  OS = linux
 +  PD_PATH = /usr
 +  OPT_CFLAGS = -O6 -funroll-loops -fomit-frame-pointer
-+  CFLAGS += -fPIC
++  CFLAGS += -DUNIX -fPIC
 +  LDFLAGS += -rdynamic -shared -fPIC
    LIBS += -lc
    STRIP = strip --strip-unneeded -R .note -R .comment
@@ -45,7 +129,12 @@ Last-Update: <2011-12-31>
    EXTENSION = dll
    OS = cygwin
    PD_PATH = $(cygpath $(PROGRAMFILES))/pd
-@@ -75,6 +100,7 @@ ifeq (CYGWIN,$(findstring CYGWIN,$(UNAME
+   OPT_CFLAGS = -O6 -funroll-loops -fomit-frame-pointer
+-  CFLAGS += 
++  CFLAGS += -DUNIX
+   LDFLAGS += -Wl,--export-dynamic -shared -L"$(PD_PATH)/src" -L"$(PD_PATH)/bin"
+   LIBS += -lc -lpd
+   STRIP = strip --strip-unneeded -R .note -R .comment
  endif
  ifeq (MINGW,$(findstring MINGW,$(UNAME)))
    CPU := $(shell uname -m)
diff --git a/debian/patches/makefile-common-fixes-for-hurd-and-kfreebsd b/debian/patches/makefile-common-fixes-for-hurd-and-kfreebsd
deleted file mode 100644
index 9959a55..0000000
--- a/debian/patches/makefile-common-fixes-for-hurd-and-kfreebsd
+++ /dev/null
@@ -1,24 +0,0 @@
-Description: updated Makefile.common to fix for HURD and kFreeBSD
- This patch is generated from the upstream updated Makefile.
-Author: Hans-Christoph Steiner <hans at eds.org>
-Forwarded: not-needed
-Last-Update: <2011-12-31>
-
---- pd-cyclone-0.1~alpha55.orig/Makefile.common
-+++ pd-cyclone-0.1~alpha55/Makefile.common
-@@ -2,6 +2,15 @@
- PD_DIR ?= $(ROOT_DIR)/../../pd/src
- 
- OS_NAME = $(shell uname -s)
-+
-+# Debian has options for the GNU HURD and kFreeBSD kernels
-+ifeq ($(OS_NAME),GNU)
-+  OS_NAME=Linux
-+endif
-+ifeq ($(OS_NAME),GNU/kFreeBSD)
-+  OS_NAME=Linux
-+endif
-+
- ifneq ($(OS_NAME),Linux)
- ifneq ($(OS_NAME),Darwin)
- ifeq (,$(findstring MinGW,$(OS_NAME)))
diff --git a/debian/patches/series b/debian/patches/series
index 180935e..b7afb6e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 add_required_internal_pd_headers
-update-makefile-for-hurd-and-kfreebsd
-makefile-common-fixes-for-hurd-and-kfreebsd
+fix-hurd-and-kfreebsd

-- 
pd-cyclone packaging

