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

[Dan S]

2011/11/19 Reinhard Tartler <siretart at tauware.de>:
> On Di, Nov 15, 2011 at 11:07:19 (CET), danstowell-guest at users.alioth.debian.org wrote:
>
>> 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
>> +
>
> As this package showed up on PET and looked easy, I've tried to upload
> it. Eventually, I gave up because I failed to create a source package
> that I can pass to my pbuilder. Upon further investigation, I noticed
> that the package is a) CDBS and b) uses scons and c) runs scons in the
> 'clean' target in a way that it makes it fail if development headers
> such as libreadline-dev and libicu-dev are missing. I cannot imagine
> that the 'clean:' rule really require these packages to fulfill their
> jobs.
>
> This may be a minor issue, but eventually, made me give up uploading the
> package.

Thanks for reporting - are you able to test if this patch fixes the issue?

diff --git a/common/SConstruct b/common/SConstruct
index 76908d0..a674816 100644
--- a/common/SConstruct
+++ b/common/SConstruct
@@ -578,7 +578,8 @@ if env['LANG']:
         )
     else:
         print "libicu not found"
-        Exit(1)
+        if isDefaultBuild():
+            Exit(1)

 # readline
 if env['LANG'] and env['READLINE'] and env['GPL3']:
@@ -588,7 +589,8 @@ if env['LANG'] and env['READLINE'] and env['GPL3']:
         )
     else:
         print "libreadline not found"
-        Exit(1)
+        if isDefaultBuild():
+            Exit(1)

 # only _one_ Configure context can be alive at a time
 env = conf.Finish()