[SCM] jcgui packaging branch, master, updated. debian/0.7-1-8-g2bcfe05

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Sun Jun 20 17:35:20 UTC 2010


The following commit has been merged in the master branch:
commit 7d1d1cd192fed61f809aede9636d113e8cd957b4
Author: Alessio Treglia <alessio at debian.org>
Date:   Sun Jun 20 19:34:20 2010 +0200

    Pass LDFLAGS to the linker.

diff --git a/debian/patches/01-wscript.patch b/debian/patches/01-wscript.patch
new file mode 100644
index 0000000..5b96dcc
--- /dev/null
+++ b/debian/patches/01-wscript.patch
@@ -0,0 +1,41 @@
+Description: Pass LDFLAGS to the linker.
+Author: Alessio Treglia <alessio at debian.org>
+Forwarded: no
+---
+ src/wscript |    1 +
+ wscript     |    7 +++++++
+ 2 files changed, 8 insertions(+)
+
+--- jcgui.orig/wscript
++++ jcgui/wscript
+@@ -28,6 +28,12 @@ def set_options(opt):
+                    dest='cxxflags', 
+                    help='C++ compiler flags [Default: -O3  -march=native -Wall]')
+ 
++    opt.add_option('--ldflags',
++                   type='string',
++                   default='-Wl,--as-needed',
++                   dest='ldflags',
++                   help='Linker flags [Default: -Wl,--as-needed]')
++
+ # a bit of waf display formatting
+ def display_msg(msg, status = None, color = None):
+     sr = msg
+@@ -70,6 +76,7 @@ def configure(conf):
+     conf.define('DESKAPPS_DIR', os.path.normpath(os.path.join(conf.env['SHAREDIR'], 'applications')))
+     conf.define('BIN_NAME', APPNAME)
+     conf.define('CXXFLAGS', Options.options.cxxflags)
++    conf.define('LDFLAGS', Options.options.ldflags)
+ 
+     # config subdirs
+     conf.sub_config('src');
+--- jcgui.orig/src/wscript
++++ jcgui/src/wscript
+@@ -25,6 +25,7 @@ def build(bld):
+ 
+     prog = bld.new_task_gen('cxx', 'program')
+     prog.includes = './headers'
++    prog.ldflags= bld.env['LDFLAGS']
+     prog.cxxflags= bld.env['CXXFLAGS']
+     prog.source = [] + sources
+     prog.uselib = ['JACK', 'SNDFILE', 'GTK2']

-- 
jcgui packaging



More information about the pkg-multimedia-commits mailing list