CVS commit: pkgsrc/print/ghostscript-agpl

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Jul 12 08:55:36 UTC 2017

Modified Files:
        pkgsrc/print/ghostscript-agpl: distinfo
        pkgsrc/print/ghostscript-agpl/patches: patch-base_unix-dll.mak

Log Message:
Honor LDFLAGS in more places. Fixes RELRO build.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 pkgsrc/print/ghostscript-agpl/distinfo
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/print/ghostscript-agpl/patches/patch-base_unix-dll.mak

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/print/ghostscript-agpl/distinfo
diff -u pkgsrc/print/ghostscript-agpl/distinfo:1.16 pkgsrc/print/ghostscript-agpl/distinfo:1.17
--- pkgsrc/print/ghostscript-agpl/distinfo:1.16 Thu Apr 20 09:20:55 2017
+++ pkgsrc/print/ghostscript-agpl/distinfo      Wed Jul 12 08:55:36 2017
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.16 2017/04/20 09:20:55 jperkin Exp $
+$NetBSD: distinfo,v 1.17 2017/07/12 08:55:36 wiz Exp $
 
 SHA1 (ghostscript-9.21.tar.gz) = 6f60d7fcb5eef6a8bec5abedf21c6a7008a8c0c7
 RMD160 (ghostscript-9.21.tar.gz) = c389ab9346f86ba4ff9e5b80aca0dda7acb866a5
@@ -7,6 +7,6 @@ Size (ghostscript-9.21.tar.gz) = 3839877
 SHA1 (patch-base_gserrors_h) = ce75cfb7528871842a3bd35e18a6d91c89823909
 SHA1 (patch-base_lib.mak) = 723926f167b49568376ef0c0da6aa4ec01fe1516
 SHA1 (patch-base_mkromfs.c) = 96006928e0b5381e7101027372b6e6408f1c4a0b
-SHA1 (patch-base_unix-dll.mak) = 3b4a19212fd2e8c4a883e4983ae9595f993f889a
+SHA1 (patch-base_unix-dll.mak) = 23595f424ecd2af4a504f15817fd57cdec8851df
 SHA1 (patch-configure) = 50967456938be7061ce081335a3a602726b939a8
 SHA1 (patch-devices_devs.mak) = ceb89a4d50765e146c0f3199c31b2c053bf2be09

Index: pkgsrc/print/ghostscript-agpl/patches/patch-base_unix-dll.mak
diff -u pkgsrc/print/ghostscript-agpl/patches/patch-base_unix-dll.mak:1.2 pkgsrc/print/ghostscript-agpl/patches/patch-base_unix-dll.mak:1.3
--- pkgsrc/print/ghostscript-agpl/patches/patch-base_unix-dll.mak:1.2   Thu Apr 20 09:20:55 2017
+++ pkgsrc/print/ghostscript-agpl/patches/patch-base_unix-dll.mak       Wed Jul 12 08:55:36 2017
@@ -1,4 +1,4 @@
-$NetBSD: patch-base_unix-dll.mak,v 1.2 2017/04/20 09:20:55 jperkin Exp $
+$NetBSD: patch-base_unix-dll.mak,v 1.3 2017/07/12 08:55:36 wiz Exp $
 
 Use correct shared library naming on Darwin.
 Add some rpaths.
@@ -25,12 +25,12 @@ Add some rpaths.
  $(GSSOC_XE): gs-so-links-subtarget $(PSSRC)$(SOC_LOADER) $(UNIX_DLL_MAK) $(MAKEDIRS)
        $(GLCC) -g -o $(GSSOC_XE) $(PSSRC)dxmainc.c \
 -      -L$(BINDIR) -l$(GS_SO_BASE)
-+      -L$(BINDIR) -L$(PREFIX)/lib -Wl,-R$(PREFIX)/lib -l$(GS_SO_BASE)
++      -L$(BINDIR) -L$(PREFIX)/lib -Wl,-R$(PREFIX)/lib -l$(GS_SO_BASE) $(LDFLAGS)
  
  $(GSSOX_XE): gs-so-links-subtarget $(PSSRC)$(SOC_LOADER) $(UNIX_DLL_MAK) $(MAKEDIRS)
        $(GLCC) -g $(SOC_CFLAGS) -o $(GSSOX_XE) $(PSSRC)$(SOC_LOADER) \
 -      -L$(BINDIR) -l$(GS_SO_BASE) $(SOC_LIBS)
-+      -L$(BINDIR) -L$(PREFIX)/lib -Wl,-R$(PREFIX)/lib -l$(GS_SO_BASE) $(SOC_LIBS)
++      -L$(BINDIR) -L$(PREFIX)/lib -Wl,-R$(PREFIX)/lib -l$(GS_SO_BASE) $(SOC_LIBS) $(LDFLAGS)
  
  $(PCLSOC_XE): gpcl6-so-links-subtarget $(PLSRC)$(REALMAIN_SRC).c $(UNIX_DLL_MAK) $(MAKEDIRS)
        $(GLCC) -g -o $(PCLSOC_XE) $(PLSRC)$(REALMAIN_SRC).c -L$(BINDIR) -l$(PCL_SO_BASE)