[SCM] ardour3/master: Pass env variables to waf

[Felipe Sateler]

On Tue, Sep 24, 2013 at 9:26 PM, Jaromír Mikeš <mira.mikes at gmail.com> wrote:
> 2013/9/24 Felipe Sateler <fsateler at debian.org>
>>
>> On Tue, Sep 24, 2013 at 5:01 PM, Jaromír Mikeš <mira.mikes at gmail.com>
>> wrote:
>> > 2013/9/24 Felipe Sateler <fsateler at debian.org>
>> >> On Tue, Sep 24, 2013 at 11:33 AM,  <fsateler at users.alioth.debian.org>
>> >> >
>> >> >     Pass env variables to waf
>> >>
>> >> For some reason this works for LDFLAGS but not CFLAGS or CXXFLAGS. Any
>> >> ideas on why waf decides to ignore them? They are supposed to work...
>> >
>> > I've encountered this problem when tried fix hardening too :(
>> > Maybe we can try update waf-light from 1.6.11 (Feb 2012) to current
>> > 1.7.13,
>> > but reading waf upstream changelog I can't find nothing related to this
>> > issue.
>>
>> Can you try updating the waf-light script and seeing if *FLAGS are
>> respected?
>
>
> Having some troubles updating waf-light :(
>
> CFLAGS="-g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat
> -Werror=format-security -Wall" CXXFLAGS="-g -O2 -fstack-protector
> --param=ssp-buffer-size=4 -Wformat -Werror=format-security -Wall"
> CPPFLAGS="-D_FORTIFY_SOURCE=2" LDFLAGS="-Wl,-z,relro"
> /tmp/buildd/ardour3-3.4~dfsg/waf-light -v
> --destdir=/tmp/buildd/ardour3-3.4~dfsg/debian/tmp configure --lv2 --lxvst
> --freedesktop --configdir=/etc/ --noconfirm --prefix=/usr/ --no-phone-home
> --dist-target=x86_64
> Waf: The wscript in '/tmp/buildd/ardour3-3.4~dfsg' is unreadable
> Traceback (most recent call last):
>   File "/tmp/buildd/ardour3-3.4~dfsg/waflib/Scripting.py", line 121, in
> waf_entry_point
>     set_main_module(Context.run_dir + os.sep + Context.WSCRIPT_FILE)
>   File "/tmp/buildd/ardour3-3.4~dfsg/waflib/Scripting.py", line 163, in
> set_main_module
>     Context.g_module = Context.load_module(file_path)
>   File "/tmp/buildd/ardour3-3.4~dfsg/waflib/Context.py", line 565, in
> load_module
>     exec(compile(code, path, 'exec'), module.__dict__)
>   File "/tmp/buildd/ardour3-3.4~dfsg/wscript", line 2, in <module>
>     from waflib.extras import autowaf as autowaf
> ImportError: cannot import name autowaf

Your patch for some reason doesn't have the autowaf module:

% lsdiff debian/patches/waf.patch | grep autowaf
b/waflib/extras/autowaf.py
% lsdiff ~/Downloads/waf.patch | grep autowaf
%

It seems to be the only missing file, though.
% diff old.lsdiff new.lsdiff
--- old.lsdiff 2013-09-25 09:09:30.000000000 -0300
+++ new.lsdiff 2013-09-25 09:08:45.000000000 -0300
@@ -5,7 +5,6 @@
 waflib/Configure.py
 waflib/Context.py
 waflib/Errors.py
-waflib/extras/autowaf.py
 waflib/extras/doxygen.py
 waflib/extras/__init__.py
 waflib/extras/misc.py


I tried copying the file from the older patch. The build works, but we
still don't get C*FLAGS. I think contacting upstream would be helpful.
Can you or Adrian please ask them about this? They probably have more
waf experience than us.

-- 

Saludos,
Felipe Sateler