diff options
| author | joerg <joerg@pkgsrc.org> | 2015-04-17 15:22:44 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2015-04-17 15:22:44 +0000 |
| commit | 298aa9b91dc1bf25f73848bbb187dfcfd0a95c05 (patch) | |
| tree | 60d6c2389384cf5627856613350a0d033bb4f8fa | |
| parent | 65284815bfad34912ddd0f2d0f8655812b86999a (diff) | |
| download | pkgsrc-298aa9b91dc1bf25f73848bbb187dfcfd0a95c05.tar.gz | |
Don't depend on ${PREFIX}/lib to be added implicitly by the wrappers.
Don't use empty arguments to -o.
| -rw-r--r-- | editors/p5-Wx-Scintilla/distinfo | 4 | ||||
| -rw-r--r-- | editors/p5-Wx-Scintilla/patches/patch-aa | 35 |
2 files changed, 34 insertions, 5 deletions
diff --git a/editors/p5-Wx-Scintilla/distinfo b/editors/p5-Wx-Scintilla/distinfo index a6e9b82c8b0..31d6e644d4d 100644 --- a/editors/p5-Wx-Scintilla/distinfo +++ b/editors/p5-Wx-Scintilla/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.2 2012/09/13 14:16:44 sno Exp $ +$NetBSD: distinfo,v 1.3 2015/04/17 15:22:44 joerg Exp $ SHA1 (Wx-Scintilla-0.39.tar.gz) = 40cb8b7b7ae0b8bb418d7c885022b821369ce42e RMD160 (Wx-Scintilla-0.39.tar.gz) = d487ca7bb79ca5581f36fb8ca6e7a1a6649522ba Size (Wx-Scintilla-0.39.tar.gz) = 848565 bytes -SHA1 (patch-aa) = 67dd553cb7af54ce9aa7a6521f4e9c1c2949cc00 +SHA1 (patch-aa) = 8a29fa976b82e426c7f04ab989d20e591ae1c635 diff --git a/editors/p5-Wx-Scintilla/patches/patch-aa b/editors/p5-Wx-Scintilla/patches/patch-aa index 942bfd13112..5e8f8bd1b5f 100644 --- a/editors/p5-Wx-Scintilla/patches/patch-aa +++ b/editors/p5-Wx-Scintilla/patches/patch-aa @@ -1,9 +1,38 @@ -$NetBSD: patch-aa,v 1.2 2012/09/13 14:16:44 sno Exp $ -# some ldld's doesn't seem to understand $ORIGIN +$NetBSD: patch-aa,v 1.3 2015/04/17 15:22:44 joerg Exp $ + +- Don't use $ORIGIN, it violates pkgsrc policy. +- Obtain additional linker flags to not depend on implicit ${PREFIX}/lib. --- inc/Module/Build/Scintilla/GTK.pm.orig 2012-09-04 10:20:47.000000000 +0000 +++ inc/Module/Build/Scintilla/GTK.pm -@@ -146,7 +146,7 @@ sub stc_link_xs { +@@ -86,7 +86,7 @@ sub stc_extra_scintilla_libs { + my $extras = '-lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lpangoft2-1.0 '; + $extras .= '-lgdk_pixbuf-2.0 -lm -lpango-1.0 -lfreetype -lfontconfig -lgobject-2.0 '; + $extras .= '-lgmodule-2.0 -lgthread-2.0 -lglib-2.0'; +- return $extras; ++ return Alien::wxWidgets->libraries(qw(core base)) . ' ' . $extras; + } + + sub stc_link_scintilla_objects { +@@ -95,8 +95,7 @@ sub stc_link_scintilla_objects { + my @cmd = ( + $self->stc_linker, + $self->stc_ldflags, +- '-fPIC -shared', +- ' -o ' . $shared_lib, ++ $shared_lib, + join( ' ', @$objects ), + $self->stc_link_paths, + $self->stc_extra_scintilla_libs, +@@ -139,14 +138,14 @@ sub stc_link_xs { + my @cmd = ( + Alien::wxWidgets->linker, + Alien::wxWidgets->link_flags, ++ '-o', $dll, + $Config{lddlflags}, + '-fPIC -L.', +- '-s -o ' . $dll, + 'Scintilla.o', '-Lblib/arch/auto/Wx/Scintilla ' . $self->stc_scintilla_link, Alien::wxWidgets->libraries(qw(core base)), $Config{perllibs}, |