[SCM] lilv/master: Attempt to fix FTBFS on non-Linux architectures.
alessio at users.alioth.debian.org
alessio at users.alioth.debian.org
Thu Jun 14 18:15:56 UTC 2012
The following commit has been merged in the master branch:
commit 69678f09060f6746ea7e89b6db600bf68123058d
Author: Alessio Treglia <alessio at debian.org>
Date: Thu Jun 14 20:00:06 2012 +0200
Attempt to fix FTBFS on non-Linux architectures.
Thanks: Steven Chamberlain for the patch.
diff --git a/debian/patches/1002-fix_gnu_kfreebsd_build.patch b/debian/patches/1002-fix_gnu_kfreebsd_build.patch
new file mode 100644
index 0000000..382d700
--- /dev/null
+++ b/debian/patches/1002-fix_gnu_kfreebsd_build.patch
@@ -0,0 +1,31 @@
+From: Steven Chamberlain <steven at pyro.eu.org>
+Subject: Fix build on GNU/kFreeBSD
+
+* Still need to link with -ldl, unlike regular BSD
+* Remove extraneous -llilv, which swig2.0 on BSD-like systems would
+ fopen() even though it is a directory
+
+---
+ wscript | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- lilv.orig/wscript
++++ lilv/wscript
+@@ -198,7 +198,7 @@ def build(bld):
+ if bld.env['MSVC_COMPILER']:
+ libflags = []
+ defines = ['snprintf=_snprintf']
+- elif sys.platform.find('bsd') > 0:
++ elif sys.platform.find('bsd') > 0 and sys.platform.find('gnu') < 0:
+ lib = []
+
+ # Shared Library
+@@ -324,7 +324,7 @@ def build(bld):
+ source = 'bindings/lilv.i',
+ target = 'bindings/_lilv',
+ includes = ['..'],
+- swig_flags = '-c++ -python -Wall -I.. -llilv -features autodoc=1',
++ swig_flags = '-c++ -python -Wall -I.. -features autodoc=1',
+ use = 'liblilv')
+ autowaf.use_lib(bld, obj, 'LILV')
+
diff --git a/debian/patches/series b/debian/patches/series
index e61b9ae..163611c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
1001-dont_run_ldconfig.patch
+1002-fix_gnu_kfreebsd_build.patch
--
lilv packaging
More information about the pkg-multimedia-commits
mailing list