f150089c5e
- While here hack build system to stop slave ports from overwriting master's files on installation Reported by: miwi [1]
40 lines
1.6 KiB
Text
40 lines
1.6 KiB
Text
--- wscript.orig 2011-10-20 21:26:08.000000000 +0200
|
|
+++ wscript 2013-05-24 16:57:29.409207485 +0200
|
|
@@ -131,7 +131,8 @@
|
|
VERSION = bld.env.VERSION
|
|
)
|
|
|
|
- bld.install_files('${SHAREDDIR}', "mind.in.a.box-lament_snipplet.ogg")
|
|
+ if bld.env.BUILD_XMMS2D:
|
|
+ bld.install_files('${SHAREDDIR}', "mind.in.a.box-lament_snipplet.ogg")
|
|
|
|
bld.add_post_fun(shutdown)
|
|
|
|
@@ -295,9 +296,6 @@
|
|
conf.msg("uncommited changed", changed and "yes" or "no")
|
|
conf.env.VERSION = "%s (git commit: %s%s)" % (BASEVERSION, nam, dirty)
|
|
|
|
- conf.env.append_unique('CFLAGS', ['-g', '-O0'])
|
|
- conf.env.append_unique('CXXFLAGS', ['-g', '-O0'])
|
|
-
|
|
if conf.options.with_profiling:
|
|
conf.env.with_profiling = True
|
|
conf.env.append_unique('CFLAGS', ['--coverage'])
|
|
@@ -330,7 +328,7 @@
|
|
conf.env.PKGCONFIGDIR = conf.options.pkgconfigdir
|
|
Logs.pprint('Normal', conf.env.PKGCONFIGDIR) #XXX What is it ?
|
|
else:
|
|
- conf.env.PKGCONFIGDIR = os.path.join(conf.env.LIBDIR, 'pkgconfig')
|
|
+ conf.env.PKGCONFIGDIR = os.path.join(conf.env.PREFIX, 'libdata', 'pkgconfig')
|
|
|
|
if conf.options.config_prefix:
|
|
for d in conf.options.config_prefix:
|
|
@@ -339,6 +337,8 @@
|
|
conf.env.prepend_value('LIBPATH', os.path.join(d, 'lib'))
|
|
conf.env.prepend_value('CPPPATH', os.path.join(d, 'include'))
|
|
|
|
+ conf.env.prepend_value('LIBPATH', "%%WRKSRC%%/_build_/src/clients/lib/xmmsclient")
|
|
+
|
|
if Options.platform != 'win32':
|
|
conf.env.append_unique('CFLAGS_cstlib', ['-fPIC', '-DPIC'])
|
|
conf.env.append_unique('CPPFLAGS_cxxshlib', ['-fPIC', '-DPIC'])
|