summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <w.brodkorb@deubert.it>2016-02-02 07:02:24 +0100
committerWaldemar Brodkorb <w.brodkorb@deubert.it>2016-02-02 07:02:24 +0100
commit85ce1f0cd57ec7bd075430dc6418f1f1e09d14f3 (patch)
tree408101d91eba025f7d446f5da03efa5c2fec0c2c
parent9a9be232f4486bfbb5ea4e45c6a9230f3d1a2544 (diff)
jack2: fix cross-compile on Darwin
-rw-r--r--package/jack2/Makefile2
-rw-r--r--package/jack2/patches/patch-wscript19
2 files changed, 20 insertions, 1 deletions
diff --git a/package/jack2/Makefile b/package/jack2/Makefile
index 23429e4a7..a66b2f99b 100644
--- a/package/jack2/Makefile
+++ b/package/jack2/Makefile
@@ -5,7 +5,7 @@ include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= jack2
PKG_VERSION:= 1.9.10
-PKG_RELEASE:= 2
+PKG_RELEASE:= 3
PKG_HASH:= 9b3facf9c06dea74f388ce4e13427c3b630eedee7225b4a334c557697461d0f0
PKG_DESCR:= audio connection kit
PKG_SECTION:= mm/audio
diff --git a/package/jack2/patches/patch-wscript b/package/jack2/patches/patch-wscript
new file mode 100644
index 000000000..0ea616b04
--- /dev/null
+++ b/package/jack2/patches/patch-wscript
@@ -0,0 +1,19 @@
+--- jack2-1.9.10.orig/wscript 2014-06-02 08:43:27.000000000 +0200
++++ jack2-1.9.10/wscript 2016-02-02 06:58:57.000000000 +0100
+@@ -93,15 +93,7 @@ def configure(conf):
+ conf.load('compiler_cxx')
+ conf.load('compiler_cc')
+ if Options.options.dist_target == 'auto':
+- platform = sys.platform
+- conf.env['IS_MACOSX'] = platform == 'darwin'
+- conf.env['IS_LINUX'] = platform == 'linux' or platform == 'linux2' or platform == 'linux3' or platform == 'posix'
+- conf.env['IS_SUN'] = platform == 'sunos'
+- # GNU/kFreeBSD and GNU/Hurd are treated as Linux
+- if platform.startswith('gnu0') or platform.startswith('gnukfreebsd'):
+- conf.env['IS_LINUX'] = True
+- elif Options.options.dist_target == 'mingw':
+- conf.env['IS_WINDOWS'] = True
++ conf.env['IS_LINUX'] = True
+
+ if conf.env['IS_LINUX']:
+ Logs.pprint('CYAN', "Linux detected")