On Thu, Apr 01, 2010 at 09:53:19PM +0200, Jonas Smedegaard wrote:
> New release uses waf as build system.
So, after perhaps 3hrs of hacking, I now have a patch that enables the
use of system-wide waf. Find attached.
However, the system-wide waf is going to be removed from Debian:
http://www.mail-archive.com/debian-de...@lists.debian.org/msg281401.html
Upstream also discourages system-wide waf:
http://freehackers.org/~tnagy/wafbook/single.html#_installing_waf_on_a_system
01:17 < ita> adi_: do not trust the distributions - use your version of
waf and redistribute your code with that version - it will save you a
lot of time
01:20 < ita> adi_: waf is like a configure script, it should not be
packaged - never
Though I understand your concern, I could perfectly live with the
shipped waf. But what do I know? ;)
Cheerio
--
mail: a...@thur.de http://adi.thur.de PGP/GPG: key via keyserver
diff --git a/common/wscript b/common/wscript
index da3ab93..ba2440b 100644
--- a/common/wscript
+++ b/common/wscript
@@ -64,7 +64,7 @@ def build(bld):
'JackEngineProfiling.cpp',
]
- includes = ['.', './jack', '..']
+ includes = ['.', './jack', '..', '../build/default']
uselib = ["PTHREAD"]
if bld.env['IS_LINUX']:
diff --git a/example-clients/wscript b/example-clients/wscript
index 4cf08d1..2643b5a 100644
--- a/example-clients/wscript
+++ b/example-clients/wscript
@@ -61,7 +61,7 @@ def configure(conf):
def build(bld):
if bld.env['IS_LINUX']:
- os_incdir = ['../linux', '../posix']
+ os_incdir = ['../linux', '../posix', '../build/default']
if bld.env['IS_MACOSX']:
os_incdir = ['../macosx', '../posix']
if bld.env['IS_SUN']:
diff --git a/linux/wscript b/linux/wscript
index 869985d..93957e3 100644
--- a/linux/wscript
+++ b/linux/wscript
@@ -19,7 +19,7 @@ def create_jack_driver_obj(bld, target, sources, uselib = None):
driver.features.append('cc')
driver.env['shlib_PATTERN'] = 'jack_%s.so'
driver.defines = ['HAVE_CONFIG_H','SERVER_SIDE', 'HAVE_PPOLL']
- driver.includes = ['.', '../linux', '../posix', '../common', '../common/jack', '../dbus']
+ driver.includes = ['.', '../linux', '../posix', '../common', '../common/jack', '../dbus', '../build/default']
driver.target = target
driver.source = sources
driver.install_path = '${ADDON_DIR}/'
@@ -31,7 +31,8 @@ def create_jack_driver_obj(bld, target, sources, uselib = None):
def build(bld):
if bld.env['BUILD_JACKD'] == True:
jackd = bld.new_task_gen('cxx', 'program')
- jackd.includes = ['../linux', '../posix', '../common/jack', '../common', '../dbus']
+ jackd.features='cc cxx cprogram'
+ jackd.includes = ['../linux', '../posix', '../common/jack', '../common', '../dbus', '../build/default']
jackd.defines = 'HAVE_CONFIG_H'
jackd.source = ['../common/Jackdmp.cpp']
if bld.env['IS_LINUX'] and bld.env['BUILD_JACKDBUS']:
diff --git a/waf b/waf
index f0f7f63..cd561b6 100755
Binary files a/waf and b/waf differ
diff --git a/wscript b/wscript
index bc88c49..da75181 100644
--- a/wscript
+++ b/wscript
@@ -107,8 +107,8 @@ def configure(conf):
# conf.check_tool('compiler_cxx')
# conf.check_tool('compiler_cc')
- conf.env.append_unique('CXXFLAGS', '-O3 -Wall')
- conf.env.append_unique('CCFLAGS', '-O3 -Wall')
+ conf.env.append_unique('CXXFLAGS', ["-O3", "-Wall"])
+ conf.env.append_unique('CCFLAGS', ["-O3", "-Wall"])
conf.sub_config('common')
if conf.env['IS_LINUX']:
_______________________________________________
pkg-multimedia-maintainers mailing list
pkg-multimedia-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-multimedia-maintainers
