[SCM] supercollider/master: Fix build, due to restrictions imposed at linking time. Author: Mathieu Trudel-Lapierre

[danstowell-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit fd5913d30c0aa53f4666cc4af6e0def3f6eaa8df
Author: Dan Stowell <danstowell at users.sourceforge.net>
Date:   Tue Nov 15 09:52:40 2011 +0000

    Fix build, due to restrictions imposed at linking time.
    Author: Mathieu Trudel-Lapierre

diff --git a/debian/changelog b/debian/changelog
index 7d27f59..aa60188 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+supercollider (1:3.4.4-3) unstable; urgency=low
+
+  * Patch from Mathieu Trudel-Lapierre to fix build under stricter linking.
+    Closes: #648782
+
+ -- Dan Stowell <danstowell at users.sourceforge.net>  Tue, 15 Nov 2011 09:54:00 +0000
+
 supercollider (1:3.4.4-2) unstable; urgency=low
 
   * Team upload.
diff --git a/debian/patches/11_fix_linkingorder.diff b/debian/patches/11_fix_linkingorder.diff
new file mode 100644
index 0000000..8a70a2e
--- /dev/null
+++ b/debian/patches/11_fix_linkingorder.diff
@@ -0,0 +1,57 @@
+Description: Fixup environment variables used for linking against readline, libicu, curl, cwiid.
+Author: Mathieu Trudel-Lapierre <mathieu-tl at ubuntu.com>
+Forwarded: yes
+Last-Update: 2011-11-15
+--- a/common/SConstruct
++++ b/common/SConstruct
+@@ -575,6 +575,7 @@
+     if PLATFORM == 'darwin' or conf.CheckCHeader('unicode/uregex.h'):
+         libraries['libicu'] = Environment(
+              LINKFLAGS = '-licui18n -licuuc -licudata',
++             LIBS = [ 'icui18n', 'icuuc', 'icudata' ],
+         )
+     else:
+         print "libicu not found"
+@@ -1048,15 +1049,6 @@
+     langEnv.Append(
+     LINKFLAGS = '-Wl,-rpath-link,build -Wl,-rpath-link,' + FINAL_PREFIX + '/lib')
+ 
+-if env['CURL']:
+-    langEnv.Append(CPPDEFINES = ['HAVE_LIBCURL'])
+-    merge_lib_info(langEnv, libraries['libcurl'])
+-
+-if env['READLINE'] and env['LANG'] and env['GPL3']:
+-    langEnv.Append(CPPDEFINES = ['HAVE_READLINE'])
+-    merge_lib_info(langEnv, libraries['readline'])
+-
+-
+ libsclangEnv = langEnv.Clone(
+     PKGCONFIG_NAME = 'libsclang',
+     PKGCONFIG_DESC = 'SuperCollider synthesis language library',
+@@ -1127,6 +1119,15 @@
+ if env['LANG']:
+     merge_lib_info(libsclangEnv, libraries['libicu'])
+ 
++if env['CURL']:
++    langEnv.Append(CPPDEFINES = ['HAVE_LIBCURL'])
++    merge_lib_info(libsclangEnv, libraries['libcurl'])
++
++if env['READLINE'] and env['LANG'] and env['GPL3']:
++    langEnv.Append(CPPDEFINES = ['HAVE_READLINE'])
++    merge_lib_info(libsclangEnv, libraries['readline'])
++
++
+ # optional features
+ if features['midiapi']:
+     merge_lib_info(libsclangEnv, libraries['midiapi'])
+@@ -1161,8 +1162,8 @@
+     # HAVE_LID does the right thing in SC_LID.cpp source
+     libsclangSources += ['Source/lang/LangPrimSource/SC_LID.cpp']
+     if features['wii']:
+-                libsclangEnv.Append(CPPDEFINES = 'HAVE_WII')
+-                libsclangEnv.Append(LINKFLAGS = '-lcwiid')
++                langEnv.Append(CPPDEFINES = 'HAVE_WII')
++                langEnv.Append(LINKFLAGS = '-lcwiid')
+         #langEnv.Append(LINKFLAGS = '-lbluetooth')
+         #langEnv.Append(CPPPATH = '-I/usr/local/include/libcwiimote-0.4.0/libcwiimote/' ) #FIXME: to proper include directory
+     if features['lid']:
diff --git a/debian/patches/series b/debian/patches/series
index 5120d95..856cf08 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
 06_deb_scvim.diff
 07_deb_sced.diff
 10_fix_rpath.diff
+11_fix_linkingorder.diff

-- 
supercollider packaging