tags 400072 patch
thanks
Hello,
Please find attached a patch to fix the FTBFS.
I removed mucipher.i from the sources list in Mucipher/python/SConscript.
sources is used to make a SharedLibrary, and scons has no way to use it
for inclusion in a library.
This does not seems to be a source file. And the package builds cleanly
without.
In the same file, I changed the order of the arguments of file_copy to
match the Environment.Command documentation.
The change in Tools/SConscript is due to a bug in scons. I will file a bug
against scons, but for the moment, I recommend to use it (otherwise, scons
compile with "-D{'HAVE_VORBIS': 1}" instead of -DHAVE_VORBIS=1)
This could be fixed in other ways (e.g. by using a tupple instead of a
dictionnary: env_libmuscan.Append(CPPDEFINES = ("HAVE_VORBIS", 1)), but
this behavior do not seems to be documented.
Kind Regards,
--
Nekral
diff -rauN ../orig/museek+-0.1.12/Mucipher/python/SConscript
./museek+-0.1.12/Mucipher/python/SConscript
--- ../orig/museek+-0.1.12/Mucipher/python/SConscript 2006-06-07
12:23:42.000000000 +0200
+++ ./museek+-0.1.12/Mucipher/python/SConscript 2006-11-29 23:51:44.000000000
+0100
@@ -4,11 +4,10 @@
import os
sources = Split("""
- mucipher.i
wraphelp.c
""")
-def file_copy(target, source, env):
+def file_copy(env, target, source):
open(str(target[0]), "w").write(open(str(source[0])).read())
py_ver = str(sys.version_info[0]) + "." + str(sys.version_info[1])
diff -rauN ../orig/museek+-0.1.12/Tools/SConscript
./museek+-0.1.12/Tools/SConscript
--- ../orig/museek+-0.1.12/Tools/SConscript 2006-05-26 21:47:57.000000000
+0200
+++ ./museek+-0.1.12/Tools/SConscript 2006-11-29 23:51:44.000000000 +0100
@@ -16,7 +16,10 @@
if env['VORBIS']:
env_libmuscan.ParseConfig('pkg-config --libs --cflags vorbisfile')
if conf.CheckLibWithHeader('', 'vorbis/vorbisfile.h', 'C++',
'ov_clear(0);'):
- env_libmuscan.Append(CPPDEFINES = {'HAVE_VORBIS': 1})
+ if env_libmuscan['CPPDEFINES'] != []:
+ env_libmuscan.Append(CPPDEFINES = {"HAVE_VORBIS": 1})
+ else:
+ env_libmuscan.Replace(CPPDEFINES = {"HAVE_VORBIS": 1})
print "OGG Vorbis found, compiling into muscan."
else:
print "OGG Vorbis NOT found, not compiled into muscan."
