Skip to content

Instantly share code, notes, and snippets.

@2bits
Created September 6, 2012 15:31
Show Gist options
  • Select an option

  • Save 2bits/3657416 to your computer and use it in GitHub Desktop.

Select an option

Save 2bits/3657416 to your computer and use it in GitHub Desktop.
jack-1.9.8 patch for building with Homebrew, turns off -arch ppc
--- a/jack-1.9.8/common/wscript 2011-12-19 03:54:02.000000000 -0800
+++ b/jack-1.9.8/common/wscript 2012-09-06 08:25:19.000000000 -0700
@@ -31,7 +31,7 @@
if bld.env['IS_LINUX']:
process.env.append_value("CPPFLAGS", "-fvisibility=hidden")
if bld.env['IS_MACOSX']:
- process.env.append_value("CPPFLAGS", "-mmacosx-version-min=10.4 -arch i386 -arch ppc -arch x86_64")
+ process.env.append_value("CPPFLAGS", "-arch x86_64")
#process.env.append_value("LINKFLAGS", "-arch i386 -arch ppc -arch x86_64")
process.env.append_value("CPPFLAGS", "-fvisibility=hidden")
process.install_path = '${ADDON_DIR}/'
@@ -176,7 +176,7 @@
if bld.env['IS_MACOSX']:
serverlib.env.append_value("CPPFLAGS", "-fvisibility=hidden")
- serverlib.env.append_value("CPPFLAGS", "-mmacosx-version-min=10.4 -arch i386 -arch ppc -arch x86_64")
+ serverlib.env.append_value("CPPFLAGS", "-arch x86_64")
#serverlib.env.append_value("LINKFLAGS", "-framework CoreAudio -framework vecLib -single_module -arch i386 -arch ppc -arch x86_64")
serverlib.env.append_value("LINKFLAGS", "-framework CoreAudio -framework CoreFoundation -framework vecLib -single_module")
serverlib.env.append_value("LINKFLAGS", "-compatibility_version 1 -current_version 1")
@@ -259,7 +259,7 @@
if bld.env['IS_MACOSX']:
clientlib.env.append_value("CPPFLAGS", "-fvisibility=hidden")
- clientlib.env.append_value("CPPFLAGS", "-mmacosx-version-min=10.4 -arch i386 -arch ppc -arch x86_64")
+ clientlib.env.append_value("CPPFLAGS", "-arch x86_64")
#clientlib.env.append_value("LINKFLAGS", "-framework CoreAudio -framework vecLib -single_module -arch i386 -arch ppc -arch x86_64"
clientlib.env.append_value("LINKFLAGS", "-framework CoreAudio -framework vecLib -single_module")
clientlib.env.append_value("LINKFLAGS", "-compatibility_version 1 -current_version 1")
--- a/jack-1.9.8/example-clients/wscript 2011-12-19 03:54:19.000000000 -0800
+++ b/jack-1.9.8/example-clients/wscript 2012-09-06 08:29:32.000000000 -0700
@@ -87,7 +87,7 @@
prog.includes = os_incdir + ['../common/jack', '../common']
prog.source = example_program_source
if bld.env['IS_MACOSX']:
- prog.env.append_value("CPPFLAGS", "-mmacosx-version-min=10.4 -arch i386 -arch ppc -arch x86_64")
+ prog.env.append_value("CPPFLAGS", "-arch x86_64")
#prog.env.append_value("LINKFLAGS", "-arch i386 -arch ppc -arch x86_64")
prog.env.append_value("LINKFLAGS", "")
if bld.env['IS_LINUX']:
@@ -104,7 +104,7 @@
prog.includes = os_incdir + ['../common/jack', '../common']
prog.source = 'transport.c'
if bld.env['IS_MACOSX']:
- prog.env.append_value("CPPFLAGS", "-mmacosx-version-min=10.4 -arch i386 -arch ppc -arch x86_64")
+ prog.env.append_value("CPPFLAGS", "-arch x86_64")
#prog.env.append_value("LINKFLAGS", "-arch i386 -arch ppc -arch x86_64")
prog.env.append_value("LINKFLAGS", "")
if bld.env['IS_LINUX']:
@@ -119,7 +119,7 @@
prog.includes = os_incdir + ['../common/jack', '../common']
prog.source = 'capture_client.c'
if bld.env['IS_MACOSX']:
- prog.env.append_value("CPPFLAGS", "-mmacosx-version-min=10.4 -arch i386 -arch ppc -arch x86_64")
+ prog.env.append_value("CPPFLAGS", "-arch x86_64")
#prog.env.append_value("LINKFLAGS", "-arch i386 -arch ppc -arch x86_64")
prog.env.append_value("LINKFLAGS", "")
prog.uselib = 'SNDFILE'
@@ -163,7 +163,7 @@
lib.target = example_lib
lib.source = example_lib_source
if bld.env['IS_MACOSX']:
- lib.env.append_value("CPPFLAGS", "-mmacosx-version-min=10.4 -arch i386 -arch ppc -arch x86_64")
+ lib.env.append_value("CPPFLAGS", "-arch x86_64")
#lib.env.append_value("LINKFLAGS", "-arch i386 -arch ppc -arch x86_64")
lib.env.append_value("LINKFLAGS", "")
if bld.env['IS_SUN']:
--- a/jack-1.9.8/tests/wscript 2011-12-19 03:54:29.000000000 -0800
+++ b/jack-1.9.8/tests/wscript 2012-09-06 08:30:44.000000000 -0700
@@ -27,7 +27,7 @@
if bld.env['IS_LINUX']:
prog.uselib = 'RT'
if bld.env['IS_MACOSX']:
- prog.env.append_value("CPPFLAGS", "-mmacosx-version-min=10.4 -arch i386 -arch ppc -arch x86_64")
+ prog.env.append_value("CPPFLAGS", "-arch x86_64")
#prog.env.append_value("LINKFLAGS", "-arch i386 -arch ppc -arch x86_64")
prog.env.append_value("LINKFLAGS", "")
prog.uselib_local = 'clientlib'
--- a/jack-1.9.8/example-clients/transport.c 2011-12-19 03:54:19.000000000 -0800
+++ b/jack-1.9.8/example-clients/transport.c 2012-09-06 08:36:52.000000000 -0700
@@ -300,11 +300,11 @@
/* Isolate the command word. */
i = 0;
- while (line[i] && whitespace(line[i]))
+ while (line[i] && isspace(line[i]))
i++;
word = line + i;
- while (line[i] && !whitespace(line[i]))
+ while (line[i] && !isspace(line[i]))
i++;
if (line[i])
@@ -319,7 +319,7 @@
}
/* Get argument to command, if any. */
- while (whitespace(line[i]))
+ while (isspace(line[i]))
i++;
word = line + i;
@@ -335,14 +335,14 @@
register char *s, *t;
s = string;
- while (whitespace(*s))
+ while (isspace(*s))
s++;
if (*s == '\0')
return s;
t = s + strlen (s) - 1;
- while (t > s && whitespace(*t))
+ while (t > s && isspace(*t))
t--;
*++t = '\0';
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment