diff options
| author | wiz <wiz@pkgsrc.org> | 2017-07-12 11:04:59 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2017-07-12 11:04:59 +0000 |
| commit | 9a749cbfd3cccbf075b9b6e4e0d8255a6ad395fd (patch) | |
| tree | 531d181341eba059893b16e9f59db25c9bced478 /devel/gtexinfo | |
| parent | c7884d45a2827103624fd9da529a7112278dbec3 (diff) | |
| download | pkgsrc-9a749cbfd3cccbf075b9b6e4e0d8255a6ad395fd.tar.gz | |
Honor LDFLAGS. Fixes RELRO build.
Diffstat (limited to 'devel/gtexinfo')
| -rw-r--r-- | devel/gtexinfo/distinfo | 6 | ||||
| -rw-r--r-- | devel/gtexinfo/patches/patch-tp_Texinfo_Convert_XSParagraph_Makefile.in | 15 | ||||
| -rw-r--r-- | devel/gtexinfo/patches/patch-util_texi2dvi | 10 |
3 files changed, 21 insertions, 10 deletions
diff --git a/devel/gtexinfo/distinfo b/devel/gtexinfo/distinfo index e259d2928cb..9812cfacd91 100644 --- a/devel/gtexinfo/distinfo +++ b/devel/gtexinfo/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.49 2016/10/19 12:49:39 wiz Exp $ +$NetBSD: distinfo,v 1.50 2017/07/12 11:04:59 wiz Exp $ SHA1 (texinfo-6.3.tar.gz) = 29b16c646c7bc9cd351b2f1d8dafdce70e5377f6 RMD160 (texinfo-6.3.tar.gz) = 5673030cc0a9907489c206fd0c4bf1a925b69ea9 @@ -9,6 +9,6 @@ SHA1 (patch-ac) = 7f7226ee521fddba9f967be4fe199f6bedcfa148 SHA1 (patch-gnulib_lib_mbiter.h) = 34c291e6994c6eb51aba803f3ebf5f09d46e9bdd SHA1 (patch-gnulib_lib_mbuiter.h) = be293674c37cb91746527be07aa40acbd285d2f4 SHA1 (patch-texindex_texindex.awk) = 1f022f1495c951337997036ef1cd758ef9c116a7 +SHA1 (patch-tp_Texinfo_Convert_XSParagraph_Makefile.in) = cdb6c78c2c15d3f8ee5755625694c11ecd9004e9 SHA1 (patch-tp_Texinfo_Convert_XSParagraph_configure) = d4557bae4417cd42297bceaa76478b00b3875df3 -SHA1 (patch-tp_Texinfo_Convert_XSParagraph_xspara.c) = 198d64b5bc38a3b934ade641c282e8be3e41c4df -SHA1 (patch-util_texi2dvi) = d17608312d4b5546a2295e1be2b193124ad97256 +SHA1 (patch-util_texi2dvi) = c894eb109ef3faa7ed1cb544556ca6a97af439e9 diff --git a/devel/gtexinfo/patches/patch-tp_Texinfo_Convert_XSParagraph_Makefile.in b/devel/gtexinfo/patches/patch-tp_Texinfo_Convert_XSParagraph_Makefile.in new file mode 100644 index 00000000000..48584d2565e --- /dev/null +++ b/devel/gtexinfo/patches/patch-tp_Texinfo_Convert_XSParagraph_Makefile.in @@ -0,0 +1,15 @@ +$NetBSD: patch-tp_Texinfo_Convert_XSParagraph_Makefile.in,v 1.1 2017/07/12 11:04:59 wiz Exp $ + +Honor LDFLAGS for RELRO builds. + +--- tp/Texinfo/Convert/XSParagraph/Makefile.in.orig 2017-07-12 10:57:18.518824283 +0000 ++++ tp/Texinfo/Convert/XSParagraph/Makefile.in +@@ -573,7 +573,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ + LD = @LD@ +-LDFLAGS = $(PERL_EXT_LDFLAGS) ++LDFLAGS = $(PERL_EXT_LDFLAGS) @LDFLAGS@ + LIBOBJS = @LIBOBJS@ + LIBS = @LIBS@ + LIBTOOL = @LIBTOOL@ diff --git a/devel/gtexinfo/patches/patch-util_texi2dvi b/devel/gtexinfo/patches/patch-util_texi2dvi index e4aa6196b03..dedeb1199b9 100644 --- a/devel/gtexinfo/patches/patch-util_texi2dvi +++ b/devel/gtexinfo/patches/patch-util_texi2dvi @@ -1,14 +1,12 @@ -$NetBSD: patch-util_texi2dvi,v 1.5 2015/06/30 11:00:33 ryoon Exp $ +$NetBSD: patch-util_texi2dvi,v 1.6 2017/07/12 11:04:59 wiz Exp $ As indicated in pkg/48075, pdksh doesn't support double-parens if not containing an arithmetic expression of a particular form. Older bash and ast-ksh apparently also had problems with this. ---- util/texi2dvi.orig 2015-06-26 12:49:37.000000000 +0000 +--- util/texi2dvi.orig 2016-09-10 19:25:16.000000000 +0000 +++ util/texi2dvi -@@ -25,10 +25,10 @@ - # If possible, please send a copy of the output of the script called with - # the `--debug' option when making a bug report. +@@ -27,6 +27,6 @@ -test -f /bin/ksh && test -z "$RUNNING_KSH" \ - && { UNAMES=`uname -s`; test "x$UNAMES" = xULTRIX; } 2>/dev/null \ @@ -19,5 +17,3 @@ Older bash and ast-ksh apparently also had problems with this. +# && { RUNNING_KSH=true; export RUNNING_KSH; exec /bin/ksh $0 ${1+"$@"}; } +#unset RUNNING_KSH - # No failure shall remain unpunished. - set -e |