diff options
| author | joerg <joerg> | 2015-03-26 19:46:19 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2015-03-26 19:46:19 +0000 |
| commit | d3beca75eacaf8665cffac399a39e5cda860ace0 (patch) | |
| tree | 932dfa7d57d5c62002de510131a958d64d0394b2 /x11 | |
| parent | 1d21cfe620ce52ba4db96543c5701d417df3bb56 (diff) | |
| download | pkgsrc-d3beca75eacaf8665cffac399a39e5cda860ace0.tar.gz | |
wx-config --ld already has a trailing -o, so just use that.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/ruby-wxruby/distinfo | 4 | ||||
| -rw-r--r-- | x11/ruby-wxruby/patches/patch-rake_rakewx.rb | 12 |
2 files changed, 13 insertions, 3 deletions
diff --git a/x11/ruby-wxruby/distinfo b/x11/ruby-wxruby/distinfo index 59cd1b90a75..f76e6607408 100644 --- a/x11/ruby-wxruby/distinfo +++ b/x11/ruby-wxruby/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.2 2012/03/14 03:41:16 taca Exp $ +$NetBSD: distinfo,v 1.3 2015/03/26 19:46:19 joerg Exp $ SHA1 (wxruby-2.0.1.tar.gz) = ca53e97430330b34856d10dcde210e3772d61826 RMD160 (wxruby-2.0.1.tar.gz) = 053a0adc5c08b339ab48b1931723095ca218dd59 Size (wxruby-2.0.1.tar.gz) = 1878831 bytes SHA1 (patch-rake_rakedocs.rb) = f8abbc78dd44127ccc8b97ef20c17278f6c5b022 SHA1 (patch-rake_rakenetbsd.rb) = 759c637e1280d6c5bfd3108168841b048f52e691 -SHA1 (patch-rake_rakewx.rb) = 439a1426bb3c6fec5eeefa4c6e055d2388538acd +SHA1 (patch-rake_rakewx.rb) = eb2bd65e914030a870026e109c6e2e751dcae1af diff --git a/x11/ruby-wxruby/patches/patch-rake_rakewx.rb b/x11/ruby-wxruby/patches/patch-rake_rakewx.rb index 160ef77533d..236133f14aa 100644 --- a/x11/ruby-wxruby/patches/patch-rake_rakewx.rb +++ b/x11/ruby-wxruby/patches/patch-rake_rakewx.rb @@ -1,9 +1,19 @@ -$NetBSD: patch-rake_rakewx.rb,v 1.1.1.1 2011/08/13 02:12:35 taca Exp $ +$NetBSD: patch-rake_rakewx.rb,v 1.2 2015/03/26 19:46:19 joerg Exp $ * Tweak to use vendorlibdir/vendorarchdir instead of sitelbdir/sitearchdir. +* wx-config --ld ends in "-o" already, so use that. --- rake/rakewx.rb.orig 2009-09-08 20:36:50.000000000 +0000 +++ rake/rakewx.rb +@@ -98,7 +98,7 @@ end + # Target to run the linker to create a final .so/.dll wxruby2 library + file TARGET_LIB => all_obj_files do | t | + objs = $extra_objs + " " + all_obj_files.join(' ') +- sh "#{$ld} #{$ldflags} #{objs} #{$libs} #{$link_output_flag}#{t.name}" ++ sh "#{$ld}#{t.name} #{$ldflags} #{objs} #{$libs}" + end + + # The main source module - which needs to initialize all the other modules @@ -162,10 +162,16 @@ end desc "Install the WxRuby library to Ruby's lib directories" |