diff options
| author | nia <nia@pkgsrc.org> | 2022-03-27 10:26:53 +0000 |
|---|---|---|
| committer | nia <nia@pkgsrc.org> | 2022-03-27 10:26:53 +0000 |
| commit | 69672e1ff1a32d1ac9341ae92fa657e7dc45a526 (patch) | |
| tree | 8708fab0622e52f497d89629b53b9aa27faa7ce6 /x11 | |
| parent | c5016abc1f5837701b2a7dafb6f8cc07609c6c80 (diff) | |
| download | pkgsrc-69672e1ff1a32d1ac9341ae92fa657e7dc45a526.tar.gz | |
filerunner: Fix RELRO builds. Do not mandate -O3.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/filerunner/distinfo | 4 | ||||
| -rw-r--r-- | x11/filerunner/patches/patch-Makefile | 30 | ||||
| -rw-r--r-- | x11/filerunner/patches/patch-aa | 15 |
3 files changed, 32 insertions, 17 deletions
diff --git a/x11/filerunner/distinfo b/x11/filerunner/distinfo index 8e826621889..00041c479da 100644 --- a/x11/filerunner/distinfo +++ b/x11/filerunner/distinfo @@ -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 diff --git a/x11/filerunner/patches/patch-Makefile b/x11/filerunner/patches/patch-Makefile new file mode 100644 index 00000000000..f45c1f7c87e --- /dev/null +++ b/x11/filerunner/patches/patch-Makefile @@ -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 + diff --git a/x11/filerunner/patches/patch-aa b/x11/filerunner/patches/patch-aa deleted file mode 100644 index 0d472c117c1..00000000000 --- a/x11/filerunner/patches/patch-aa +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-aa,v 1.5 2000/08/31 17:40:48 jwise Exp $ - ---- Makefile.orig Tue Mar 24 11:24:06 1998 -+++ Makefile Tue Mar 24 11:25:50 1998 -@@ -1,7 +1,7 @@ - # 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) - |