CVS commit: pkgsrc/sysutils/gkrellm

["Masatake Daimon" <pho%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   pho
Date:           Sat Nov 27 04:43:02 UTC 2021

Modified Files:
        pkgsrc/sysutils/gkrellm: Makefile distinfo
        pkgsrc/sysutils/gkrellm/patches: patch-src_Makefile

Log Message:
Honor pkgsrc LDFLAGS to support RELRO


To generate a diff of this commit:
cvs rdiff -u -r1.105 -r1.106 pkgsrc/sysutils/gkrellm/Makefile
cvs rdiff -u -r1.48 -r1.49 pkgsrc/sysutils/gkrellm/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/sysutils/gkrellm/patches/patch-src_Makefile

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

Modified files:

Index: pkgsrc/sysutils/gkrellm/Makefile
diff -u pkgsrc/sysutils/gkrellm/Makefile:1.105 pkgsrc/sysutils/gkrellm/Makefile:1.106
--- pkgsrc/sysutils/gkrellm/Makefile:1.105      Wed Sep 29 19:01:20 2021
+++ pkgsrc/sysutils/gkrellm/Makefile    Sat Nov 27 04:43:02 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.105 2021/09/29 19:01:20 adam Exp $
+# $NetBSD: Makefile,v 1.106 2021/11/27 04:43:02 pho Exp $
 .include "Makefile.common"
 
 PKGREVISION=           45
@@ -34,6 +34,11 @@ MAKE_FLAGS+=         BINOWNER=${BINOWN} BINGROU
 INSTALL_MAKE_FLAGS+=   MANDIR=${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 INSTALL_MAKE_FLAGS+=   SMANDIR=${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
 
+# Fix PR pkg/40047, Thanks to Ondrej Tuma
+.if ${OBJECT_FMT} == "ELF"
+LDFLAGS+=      -Wl,-export-dynamic
+.endif
+
 SUBST_STAGE.gkprefix=  pre-configure
 SUBST_FILES.gkprefix=  src/gkrellm.h
 SUBST_SED.gkprefix=    -e '/SYSTEM_/{s!/usr!${PREFIX}!;}'

Index: pkgsrc/sysutils/gkrellm/distinfo
diff -u pkgsrc/sysutils/gkrellm/distinfo:1.48 pkgsrc/sysutils/gkrellm/distinfo:1.49
--- pkgsrc/sysutils/gkrellm/distinfo:1.48       Tue Oct 26 11:19:38 2021
+++ pkgsrc/sysutils/gkrellm/distinfo    Sat Nov 27 04:43:02 2021
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.48 2021/10/26 11:19:38 nia Exp $
+$NetBSD: distinfo,v 1.49 2021/11/27 04:43:02 pho Exp $
 
 BLAKE2s (gkrellm-2.2.10.tar.bz2) = 7cfeedd45dd708d10725ead8e46f01394da4db5219c9393341c2d66eda03ac73
 SHA512 (gkrellm-2.2.10.tar.bz2) = f3bc055c54bd18c20a59fae471e27c7f4067067525cbc351a0e9fb80a70f7da59c220f36ecabae341e73e0b0e93546edabebff896eed863b515c6d8408a5670a
@@ -27,4 +27,4 @@ SHA1 (patch-av) = 09cbc2fbb8226f8fe56bff
 SHA1 (patch-aw) = c32ae045dad9754edb88e375b8893cfe161567d0
 SHA1 (patch-ay) = 54ce179dd051509d9fdf857730cf2ddf9b9fe0b3
 SHA1 (patch-az) = 3dbfe97e17a9aad5a6fc8e62b1116ac1fd2ec3a2
-SHA1 (patch-src_Makefile) = 931a61c8a067bde47846044f6fd43a2184df2563
+SHA1 (patch-src_Makefile) = 2f5e83b5d8eca2a2e7dff8e05e85da0ce84fe02e

Index: pkgsrc/sysutils/gkrellm/patches/patch-src_Makefile
diff -u pkgsrc/sysutils/gkrellm/patches/patch-src_Makefile:1.1 pkgsrc/sysutils/gkrellm/patches/patch-src_Makefile:1.2
--- pkgsrc/sysutils/gkrellm/patches/patch-src_Makefile:1.1      Sat Dec 29 15:55:50 2018
+++ pkgsrc/sysutils/gkrellm/patches/patch-src_Makefile  Sat Nov 27 04:43:02 2021
@@ -1,7 +1,6 @@
-$NetBSD: patch-src_Makefile,v 1.1 2018/12/29 15:55:50 triaxx Exp $
+$NetBSD: patch-src_Makefile,v 1.2 2021/11/27 04:43:02 pho Exp $
 
-Fix PR pkg/40047
-Thanks to Ondrej Tuma
+Honor LDFLAGS set by pkgsrc while linking gkrellm.
 
 --- src/Makefile.orig  2018-12-29 15:47:29.689517593 +0000
 +++ src/Makefile
@@ -10,7 +9,7 @@ Thanks to Ondrej Tuma
  
  gkrellm static: $(OBJS)
 -      $(CC) $(OBJS) -o gkrellm$(if $(findstring static,$@),.static -static) $(LIBS) $(LINK_FLAGS)
-+      $(CC) $(OBJS) -o gkrellm$(if $(findstring static,$@),.static -static) -Wl,-export-dynamic $(LIBS) $(LINK_FLAGS)
++      $(CC) $(OBJS) -o gkrellm$(if $(findstring static,$@),.static -static) $(LDFLAGS) $(LIBS) $(LINK_FLAGS)
  
  install: gkrellm
        $(INSTALL_DIR) $(INSTALLDIR)