comms/multisync-gui: Fix indirect linking on DragonFly

The Scons script had to be modified to accept LDFLAGS environment
variable.  This was piggy-backed to existing patch.
This commit is contained in:
marino 2012-05-16 19:57:56 +00:00
parent 7136029b33
commit a3f72c6129
3 changed files with 8 additions and 5 deletions

View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.17 2012/04/27 12:31:38 obache Exp $ # $NetBSD: Makefile,v 1.18 2012/05/16 19:57:56 marino Exp $
# #
DISTNAME= multisync-gui-0.91.0 DISTNAME= multisync-gui-0.91.0
@ -17,6 +17,8 @@ HAS_CONFIGURE= yes
REPLACE_PYTHON= waf REPLACE_PYTHON= waf
LDFLAGS.DragonFly= -lgthread-2.0
.include "../../lang/python/application.mk" .include "../../lang/python/application.mk"
.include "../../devel/glib2/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk"

View file

@ -1,7 +1,7 @@
$NetBSD: distinfo,v 1.2 2012/02/16 17:35:30 hans Exp $ $NetBSD: distinfo,v 1.3 2012/05/16 19:57:56 marino Exp $
SHA1 (multisync-gui-0.91.0.tar.gz) = 03b32007dab9945ee08affe6ac59be34f565adcb SHA1 (multisync-gui-0.91.0.tar.gz) = 03b32007dab9945ee08affe6ac59be34f565adcb
RMD160 (multisync-gui-0.91.0.tar.gz) = 7522f28e217acefde9076229da81ab4df627e2af RMD160 (multisync-gui-0.91.0.tar.gz) = 7522f28e217acefde9076229da81ab4df627e2af
Size (multisync-gui-0.91.0.tar.gz) = 112933 bytes Size (multisync-gui-0.91.0.tar.gz) = 112933 bytes
SHA1 (patch-aa) = 13417a99cfeb6d50bbe3c9cafbe970e870e0b417 SHA1 (patch-aa) = 65b9735de7fec54ac2cd8cf34801f8185c51c2a6
SHA1 (patch-configure) = 8802f1d38d4f159e42ab5ce1730488c4095375ba SHA1 (patch-configure) = 8802f1d38d4f159e42ab5ce1730488c4095375ba

View file

@ -1,11 +1,12 @@
$NetBSD: patch-aa,v 1.1.1.1 2009/02/27 17:44:14 drochner Exp $ $NetBSD: patch-aa,v 1.2 2012/05/16 19:57:56 marino Exp $
--- src/wscript.orig 2006-11-06 20:36:21.000000000 +0100 --- src/wscript.orig 2006-11-06 20:36:21.000000000 +0100
+++ src/wscript +++ src/wscript
@@ -16,6 +16,8 @@ def build(bld): @@ -16,6 +16,9 @@ def build(bld):
obj_gui.find_sources_in_dirs('. plugins') obj_gui.find_sources_in_dirs('. plugins')
obj_gui.defines='HAVE_CONFIG_H=1' obj_gui.defines='HAVE_CONFIG_H=1'
obj_gui.uselib = 'GLIB GTK GLADE OPENSYNC OPENSYNCENGINE' obj_gui.uselib = 'GLIB GTK GLADE OPENSYNC OPENSYNCENGINE'
+ obj_gui.env['LINKFLAGS'] += [os.getenv('LDFLAGS')]
+ obj_gui.env['LINKFLAGS'] += ['-Wl,-R' + os.getenv('LOCALBASE') + '/lib'] + obj_gui.env['LINKFLAGS'] += ['-Wl,-R' + os.getenv('LOCALBASE') + '/lib']
+ obj_gui.env['LINKFLAGS'] += ['-Wl,-R' + os.getenv('X11BASE') + '/lib'] + obj_gui.env['LINKFLAGS'] += ['-Wl,-R' + os.getenv('X11BASE') + '/lib']