diff options
author | Hans-Christoph Steiner <eighthave@users.sourceforge.net> | 2006-12-23 07:53:31 +0000 |
---|---|---|
committer | Hans-Christoph Steiner <eighthave@users.sourceforge.net> | 2006-12-23 07:53:31 +0000 |
commit | e213c74dad16887c4b79aeef047877203e084b07 (patch) | |
tree | ae588764149e960b61ab924772ba04f04b240746 /packages/patches/darwin | |
parent | 79303b6fb91be89b810c16dee8c99e51daf6fdb1 (diff) |
updated patch collection to apply and build against stable_0_40, which is currently at 0.40.1
svn path=/trunk/; revision=7049
Diffstat (limited to 'packages/patches/darwin')
-rw-r--r-- | packages/patches/darwin/darwin_dlopen.patch | 44 | ||||
-rw-r--r-- | packages/patches/darwin/darwin_jack_weak_linking-0.39.2.patch | 37 |
2 files changed, 0 insertions, 81 deletions
diff --git a/packages/patches/darwin/darwin_dlopen.patch b/packages/patches/darwin/darwin_dlopen.patch deleted file mode 100644 index 971ad391..00000000 --- a/packages/patches/darwin/darwin_dlopen.patch +++ /dev/null @@ -1,44 +0,0 @@ -Index: s_loader.c -=================================================================== -RCS file: /cvsroot/pure-data/pd/src/s_loader.c,v -retrieving revision 1.4 -diff -u -w -r1.4 s_loader.c ---- s_loader.c 6 Sep 2004 20:20:35 -0000 1.4 -+++ s_loader.c 26 Nov 2005 00:27:11 -0000 -@@ -2,6 +2,9 @@ - * For information on usage and redistribution, and for a DISCLAIMER OF ALL - * WARRANTIES, see the file, "LICENSE.txt," in this distribution. */ - -+#ifdef __APPLE__ -+#define DL_OPEN -+#endif - #ifdef DL_OPEN - #include <dlfcn.h> - #endif -@@ -13,7 +16,7 @@ - #include <io.h> - #include <windows.h> - #endif --#ifdef MACOSX -+#ifdef MACOSX10.2 - #include <mach-o/dyld.h> - #endif - #include <string.h> -@@ -90,7 +93,7 @@ - if (lastdot = strrchr(nameptr, '.')) - *lastdot = 0; - --#ifdef MACOSX -+#ifdef MACOSX10.2 - strcpy(symname, "_"); - strcat(symname, nameptr); - #else -@@ -122,7 +125,7 @@ - } - makeout = (t_xxx)GetProcAddress(ntdll, symname); - #endif --#ifdef MACOSX -+#ifdef MACOSX10.2 - { - NSObjectFileImage image; - void *ret; diff --git a/packages/patches/darwin/darwin_jack_weak_linking-0.39.2.patch b/packages/patches/darwin/darwin_jack_weak_linking-0.39.2.patch deleted file mode 100644 index aa5b7e69..00000000 --- a/packages/patches/darwin/darwin_jack_weak_linking-0.39.2.patch +++ /dev/null @@ -1,37 +0,0 @@ -Index: configure.in -=================================================================== -RCS file: /cvsroot/pure-data/pd/src/configure.in,v -retrieving revision 1.15 -diff -u -w -r1.15 configure.in ---- configure.in 16 Aug 2005 04:06:28 -0000 1.15 -+++ configure.in 22 Feb 2006 05:19:42 -0000 -@@ -316,11 +316,11 @@ - EXTERNTARGET=pd_darwin - if test x$jack == "xyes"; - then -- LDFLAGS=$LDFLAGS" -framework Jack" -+ LDFLAGS=$LDFLAGS" -weak_framework Jack" - fi - if test x$jack == "xrun"; - then -- LDFLAGS=$LDFLAGS" -framework Jack" -+ LDFLAGS=$LDFLAGS" -weak_framework Jack" - fi - fi - -Index: makefile.in -=================================================================== -RCS file: /cvsroot/pure-data/pd/src/makefile.in,v -retrieving revision 1.8 -diff -u -w -r1.8 makefile.in ---- makefile.in 24 Jul 2005 19:41:14 -0000 1.8 -+++ makefile.in 22 Feb 2006 05:19:42 -0000 -@@ -1,3 +1,8 @@ -+# On Mac OS X, this needs to be defined to enable dlopen and weak linking -+# support. Its safe on other platforms since gcc only checks this env var on -+# Apple's gcc. <hans@at.or.at> -+export MACOSX_DEPLOYMENT_TARGET = 10.3 -+ - VPATH = ../obj:./ - OBJ_DIR = ../obj - BIN_DIR = ../bin |