CVS commit: pkgsrc/x11/filerunner

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Sun Mar 27 10:26:53 UTC 2022

Modified Files:
        pkgsrc/x11/filerunner: distinfo
Added Files:
        pkgsrc/x11/filerunner/patches: patch-Makefile
Removed Files:
        pkgsrc/x11/filerunner/patches: patch-aa

Log Message:
filerunner: Fix RELRO builds. Do not mandate -O3.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/x11/filerunner/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/x11/filerunner/patches/patch-Makefile
cvs rdiff -u -r1.5 -r0 pkgsrc/x11/filerunner/patches/patch-aa

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

Modified files:

Index: pkgsrc/x11/filerunner/distinfo
diff -u pkgsrc/x11/filerunner/distinfo:1.9 pkgsrc/x11/filerunner/distinfo:1.10
--- pkgsrc/x11/filerunner/distinfo:1.9  Tue Oct 26 11:33:48 2021
+++ pkgsrc/x11/filerunner/distinfo      Sun Mar 27 10:26:53 2022
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.9 2021/10/26 11:33:48 nia Exp $
+$NetBSD: distinfo,v 1.10 2022/03/27 10:26:53 nia Exp $
 
 BLAKE2s (FileRunner-2.5.1.tar.gz) = 7dbf2b69423ba302f4e94d828f284b8b632c16f81dfd2e5826b5c3d31e28a123
 SHA512 (FileRunner-2.5.1.tar.gz) = 922740549af2c03be47dfcf7e29815d682eebe63f06f7aaebdfa576e0f7fcb596150e76aa2b032046c4cb1cff4aae836b3e4c4fc6ae56b25ca63684f7d75e25e
 Size (FileRunner-2.5.1.tar.gz) = 122795 bytes
-SHA1 (patch-aa) = 3e929372fee6620c23022e5eaecd33830d9151f7
+SHA1 (patch-Makefile) = 83631302e9587df250f771e8deaa3394a62ec345
 SHA1 (patch-ab) = 58bc890c640a9b58589e9fcdef7a9201f84f6e53
 SHA1 (patch-ac) = fdef8612ff1ea187fbe26cb203f8f3f006032ef3
 SHA1 (patch-ad) = cf7999d58ec441b03a3baa5d8097b26781bd00eb

Added files:

Index: pkgsrc/x11/filerunner/patches/patch-Makefile
diff -u /dev/null pkgsrc/x11/filerunner/patches/patch-Makefile:1.1
--- /dev/null   Sun Mar 27 10:26:54 2022
+++ pkgsrc/x11/filerunner/patches/patch-Makefile        Sun Mar 27 10:26:53 2022
@@ -0,0 +1,30 @@
+$NetBSD: patch-Makefile,v 1.1 2022/03/27 10:26:53 nia Exp $
+
+Make fewer assumptions.
+
+Avoid calling the linker directly, instead call it through
+CC. Honor LDFLAGS and allow the cwrappers to apply things
+like RELRO.
+
+--- Makefile.orig      2022-03-27 10:22:44.010550233 +0000
++++ Makefile
+@@ -1,14 +1,12 @@
+ # Change this if you have this stuff somewhere else.
+-TCLINC = /usr/local/lib/tcl8.0
+-TKINC  = /usr/local/lib/tk8.0
+-X11INC = /usr/X11/include
++TCLINC = ${LOCALBASE}/include
++TKINC  = ${LOCALBASE}/include
++X11INC = ${X11BASE}/include
+ 
+-CFLAGS = -D__FreeBSD__ -Wall -fPIC -O3 -I$(TCLINC) -I$(TKINC) -I$(X11INC)
+-
+-CC = gcc
++CFLAGS += -D__FreeBSD__ -Wall -fPIC -I$(TCLINC) -I$(TKINC) -I$(X11INC)
+ 
+ all: ext.so
+ 
+ ext.so: ext.o
+-      ld -Bshareable -o ext.so ext.o
++      $(CC) $(LDFLAGS) -shared -o ext.so ext.o
+