tags 624982 + patch
thanks

Dear maintainer,

I've prepared an NMU for csound (versioned as 1:5.13.0~dfsg-3.1) and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer.

--
Jakub Wilk
diffstat for csound-5.13.0~dfsg csound-5.13.0~dfsg

 changelog                           |    9 +++++++++
 patches/3000-fix-ftbfs-gcc-4.6.diff |   35 +++++++++++++++++++++++++++++++++++
 patches/series                      |    1 +
 3 files changed, 45 insertions(+)

diff -Nru csound-5.13.0~dfsg/debian/changelog csound-5.13.0~dfsg/debian/changelog
--- csound-5.13.0~dfsg/debian/changelog	2011-02-21 21:43:21.000000000 +0100
+++ csound-5.13.0~dfsg/debian/changelog	2011-06-26 20:41:10.000000000 +0200
@@ -1,3 +1,12 @@
+csound (1:5.13.0~dfsg-3.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * In order to fix FTBFS with GCC, don't append --no-export-all-symbols to
+    SHLINKFLAGS 4.6 (closes: #624982). Thanks to Lucas Nussbaum for the bug
+    report.
+
+ -- Jakub Wilk <jw...@debian.org>  Sun, 26 Jun 2011 20:41:04 +0200
+
 csound (1:5.13.0~dfsg-3) unstable; urgency=low
 
   * Beats needs bison and flex in order to build (Closes: #613933)
diff -Nru csound-5.13.0~dfsg/debian/patches/3000-fix-ftbfs-gcc-4.6.diff csound-5.13.0~dfsg/debian/patches/3000-fix-ftbfs-gcc-4.6.diff
--- csound-5.13.0~dfsg/debian/patches/3000-fix-ftbfs-gcc-4.6.diff	1970-01-01 01:00:00.000000000 +0100
+++ csound-5.13.0~dfsg/debian/patches/3000-fix-ftbfs-gcc-4.6.diff	2011-06-26 20:40:58.000000000 +0200
@@ -0,0 +1,35 @@
+Description: Fix FTBFS with GCC 4.6.
+ Don't append --no-export-all-symbols to SHLINKFLAGS. This is not a valid
+ compiler flag, and as such is causing FTBFS with GCC 4.6.
+Author: Jakub Wilk <jw...@debian.org>
+Bug-Debian: http://bugs.debian.org/624982
+Last-Update: 2011-06-26
+
+--- a/SConstruct
++++ b/SConstruct
+@@ -2439,7 +2439,6 @@
+         acEnvironment['LINKFLAGS'].remove(flag)
+     if getPlatform() == 'linux':
+         acEnvironment.Append(LIBS = ['util', 'dl', 'm'])
+-        acEnvironment.Append(SHLINKFLAGS = '--no-export-all-symbols')
+         acEnvironment.Append(LINKFLAGS = ['-Wl,-rpath-link,.'])
+         acEnvironment.Append(LIBS = ['fltk_images'])
+         guiProgramEnvironment.Prepend(LINKFLAGS = ['-Wl,-rpath-link,.'])
+@@ -2571,7 +2570,6 @@
+     vstEnvironment.Append(LIBS = libCsoundLibs)
+     if getPlatform() == 'linux':
+         vstEnvironment.Append(LIBS = ['util', 'dl', 'm'])
+-        vstEnvironment.Append(SHLINKFLAGS = '--no-export-all-symbols')
+         vstEnvironment.Append(LINKFLAGS = ['-Wl,-rpath-link,.'])
+         guiProgramEnvironment.Prepend(LINKFLAGS = ['-Wl,-rpath-link,.'])
+     elif getPlatform() == 'darwin':
+--- a/frontends/SConscript
++++ b/frontends/SConscript
+@@ -392,7 +392,6 @@
+         acEnvironment['SHLINKFLAGS'].remove(flag)
+     if util.platform == 'linux':
+         acEnvironment.Append(LIBS               = ['util', 'dl', 'm'])
+-        acEnvironment.Append(SHLINKFLAGS        = '--no-export-all-symbols')
+         acEnvironment.Append(LINKFLAGS          = ['-Wl,-rpath-link,interfaces'])
+         acEnvironment.Append(LIBS               = ['fltk', 'fltk_images'])
+         try     : os.symlink('lib_CsoundAC.so', '_CsoundAC.so')
diff -Nru csound-5.13.0~dfsg/debian/patches/series csound-5.13.0~dfsg/debian/patches/series
--- csound-5.13.0~dfsg/debian/patches/series	2011-02-21 21:43:21.000000000 +0100
+++ csound-5.13.0~dfsg/debian/patches/series	2011-06-26 20:34:20.000000000 +0200
@@ -14,3 +14,4 @@
 2011-no-link-csoundac-python.diff
 2012-luaCsnd-soname.diff
 2013-no-rawwave-defined.diff
+3000-fix-ftbfs-gcc-4.6.diff
_______________________________________________
pkg-multimedia-maintainers mailing list
pkg-multimedia-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers

Reply via email to