diff options
| author | wiz <wiz@pkgsrc.org> | 2017-07-15 19:10:57 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2017-07-15 19:10:57 +0000 |
| commit | 3f8ae816d9c1a8abe1e43adb3cef021e751237e6 (patch) | |
| tree | 7b91566be5d1d32e1e74278a493a2049b2af3f46 /x11/wxGTK30 | |
| parent | cfb0d1f518d81f4a156c7d3d89be88c734dff8da (diff) | |
| download | pkgsrc-3f8ae816d9c1a8abe1e43adb3cef021e751237e6.tar.gz | |
Honor LDFLAGS. Fixes RELRO build.
Diffstat (limited to 'x11/wxGTK30')
| -rw-r--r-- | x11/wxGTK30/distinfo | 3 | ||||
| -rw-r--r-- | x11/wxGTK30/patches/patch-Makefile.in | 32 |
2 files changed, 34 insertions, 1 deletions
diff --git a/x11/wxGTK30/distinfo b/x11/wxGTK30/distinfo index b0cd18b5d8c..b31506d5bbc 100644 --- a/x11/wxGTK30/distinfo +++ b/x11/wxGTK30/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.7 2016/03/27 17:11:37 joerg Exp $ +$NetBSD: distinfo,v 1.8 2017/07/15 19:10:57 wiz Exp $ SHA1 (wxWidgets-3.0.2-libtool.3.diff.bz2) = ffc3fbec9b1a8a9c19ac5f3750c78559b6bb2c81 RMD160 (wxWidgets-3.0.2-libtool.3.diff.bz2) = 54f4aa932208172496e620def1d854602d87b12e @@ -8,6 +8,7 @@ SHA1 (wxWidgets-3.0.2.tar.bz2) = 6461eab4428c0a8b9e41781b8787510484dea800 RMD160 (wxWidgets-3.0.2.tar.bz2) = a7f404c8a64ca68fa31e408bded4387c2722196b SHA512 (wxWidgets-3.0.2.tar.bz2) = 098f79863103f3be0b7e21e4f0f1b34ab5277ef0033c1ef1387a9c673b0e0b76a2d732b183fa11b22cfcbbfdb7a4884f243d12f65cd49baa1772852307b393c4 Size (wxWidgets-3.0.2.tar.bz2) = 20172909 bytes +SHA1 (patch-Makefile.in) = 57f775d5471411a5439c83c943042badc153e00f SHA1 (patch-build_aclocal_bakefile.m4) = 7d3d6fb1e6a72e370dc6147010fa5bf2c46f1206 SHA1 (patch-configure) = 897f13daa5bc8246902d7d864096d621f2e54928 SHA1 (patch-configure.in) = e49b9a83040201f01c22b3e1cbc4b331985f4e99 diff --git a/x11/wxGTK30/patches/patch-Makefile.in b/x11/wxGTK30/patches/patch-Makefile.in new file mode 100644 index 00000000000..8d11bd35b51 --- /dev/null +++ b/x11/wxGTK30/patches/patch-Makefile.in @@ -0,0 +1,32 @@ +$NetBSD: patch-Makefile.in,v 1.1 2017/07/15 19:10:57 wiz Exp $ + +Honor LDFLAGS. + +--- Makefile.in.orig 2017-07-15 18:18:47.610399130 +0000 ++++ Makefile.in +@@ -35,6 +35,7 @@ CC = @CC@ + CXX = @CXX@ + CFLAGS = @CFLAGS@ + CXXFLAGS = @CXXFLAGS@ ++LDFLAGS = @LDFLAGS@ + OBJCXXFLAGS = @OBJCXXFLAGS@ + CPPFLAGS = @CPPFLAGS@ + VENDOR = @VENDOR@ +@@ -65,7 +66,7 @@ WX_RELEASE_NODOT = 30 + WX_VERSION = $(WX_RELEASE).2 + LIBDIRNAME = $(wx_top_builddir)/lib + WXREGEX_CFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(PIC_FLAG) \ +- $(CPPFLAGS) $(CFLAGS) ++ $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) + WXREGEX_OBJECTS = \ + wxregex_regcomp.lo \ + wxregex_regexec.lo \ +@@ -14890,7 +14891,7 @@ distclean: clean + -(cd samples && $(MAKE) distclean) + + @COND_wxUSE_REGEX_builtin@$(LIBDIRNAME)/$(DLLPREFIX)wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE).la: $(WXREGEX_OBJECTS) +-@COND_wxUSE_REGEX_builtin@ ${LIBTOOL} --mode=link --tag=CC $(CC) -rpath $(libdir) -shared -o $@ $(WXREGEX_OBJECTS) $(__wxregex___importlib) -version-number 0:2:0 ++@COND_wxUSE_REGEX_builtin@ ${LIBTOOL} --mode=link --tag=CC $(CC) $(LDFLAGS) -rpath $(libdir) -shared -o $@ $(WXREGEX_OBJECTS) $(__wxregex___importlib) -version-number 0:2:0 + + @COND_wxUSE_REGEX_builtin@install_wxregex: $(__wxregex___depname) + @COND_wxUSE_REGEX_builtin@ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(libdir) |