diff options
| author | nia <nia@pkgsrc.org> | 2021-11-06 09:46:31 +0000 |
|---|---|---|
| committer | nia <nia@pkgsrc.org> | 2021-11-06 09:46:31 +0000 |
| commit | cbeb7b8db69cfd429c801e971b216b166c9256ab (patch) | |
| tree | 87ffb91f16729c1167aef3dc7d7d908426cc8471 | |
| parent | fbc4c57ce5a653d9435f66cc15eb0911e1dc2c5a (diff) | |
| download | pkgsrc-cbeb7b8db69cfd429c801e971b216b166c9256ab.tar.gz | |
9e: Honor CFLAGS/LDFLAGS. Fixes RELRO build.
| -rw-r--r-- | archivers/9e/Makefile | 4 | ||||
| -rw-r--r-- | archivers/9e/distinfo | 6 | ||||
| -rw-r--r-- | archivers/9e/patches/patch-Makefile | 37 | ||||
| -rw-r--r-- | archivers/9e/patches/patch-ab | 12 |
4 files changed, 50 insertions, 9 deletions
diff --git a/archivers/9e/Makefile b/archivers/9e/Makefile index 8040e8e866e..5cf04350fb1 100644 --- a/archivers/9e/Makefile +++ b/archivers/9e/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.13 2020/12/03 13:08:49 zafer Exp $ +# $NetBSD: Makefile,v 1.14 2021/11/06 09:46:31 nia Exp $ DISTNAME= 9e PKGNAME= 9e-1.0 -CATEGORIES= plan9 archivers +CATEGORIES= archivers plan9 MASTER_SITES= https://www.aydogan.net/distfiles/archivers/ MAINTAINER= pkgsrc-users@NetBSD.org diff --git a/archivers/9e/distinfo b/archivers/9e/distinfo index 5f29b243694..233120d8c47 100644 --- a/archivers/9e/distinfo +++ b/archivers/9e/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.6 2021/10/26 09:57:04 nia Exp $ +$NetBSD: distinfo,v 1.7 2021/11/06 09:46:31 nia Exp $ BLAKE2s (9e.tar.gz) = 51703ebf41ca22ebadf137ed9f1b744a28c6f00614eaf8867bd12c9f5f2929cb SHA512 (9e.tar.gz) = 742f7fd4e8801a63c000d1fccaa9ae851e74ceaa2cdf2c41cbfc7e647a52f6c0ac2843b87320fb7d821f7bf0112323e1b67ca4d998fcc703711dc1868d8d0516 Size (9e.tar.gz) = 2019 bytes -SHA1 (patch-aa) = 5d5982bfc544910f3d36eb40a9de9c5caa8432fd -SHA1 (patch-ab) = 7c81596f86905d6b9a42cab77fbfad6b15c911c3 +SHA1 (patch-Makefile) = bfcd5c3580449e2a36398233fb757b5d426f7a48 +SHA1 (patch-ab) = 3f46fec41407f00232c44447360e911b09cde8bb diff --git a/archivers/9e/patches/patch-Makefile b/archivers/9e/patches/patch-Makefile new file mode 100644 index 00000000000..7716a999e4e --- /dev/null +++ b/archivers/9e/patches/patch-Makefile @@ -0,0 +1,37 @@ +$NetBSD: patch-Makefile,v 1.1 2021/11/06 09:46:31 nia Exp $ + +Honor CC, CFLAGS, LDFLAGS. + +--- Makefile.orig 2000-06-15 13:40:52.000000000 +0000 ++++ Makefile +@@ -1,14 +1,7 @@ + # Makefile for 9e + +-CC = gcc +- +-CFLAGS = -g3 -ggdb +- + .PHONY: all clean distclean + +-LIBS = -lefence +- +-HDRS = 9a.h + SRCS = 9e.c + OBJS = 9e.o + +@@ -17,7 +10,7 @@ BINARIES = 9e + all: $(BINARIES) + + 9e: $(OBJS) +- $(CC) -o 9e 9e.o $(LIBS) ++ $(CC) $(LDFLAGS) -o 9e 9e.o + + clean: + rm -f *.o *~ a.out +@@ -26,4 +19,4 @@ clean: + distclean: clean + rm -f ${BINARIES} + +-# EOF +\ No newline at end of file ++# EOF diff --git a/archivers/9e/patches/patch-ab b/archivers/9e/patches/patch-ab index 8e44c0ba56e..7c4177d00ec 100644 --- a/archivers/9e/patches/patch-ab +++ b/archivers/9e/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.2 2003/02/06 15:06:18 yyamano Exp $ +$NetBSD: patch-ab,v 1.3 2021/11/06 09:46:31 nia Exp $ ---- 9e.c.orig Thu Jun 15 22:40:52 2000 +--- 9e.c.orig 2000-06-15 13:40:52.000000000 +0000 +++ 9e.c -@@ -1,6 +1,9 @@ +@@ -1,9 +1,13 @@ /* 9e.c */ #include <assert.h> @@ -12,7 +12,11 @@ $NetBSD: patch-ab,v 1.2 2003/02/06 15:06:18 yyamano Exp $ #include <dirent.h> #include <errno.h> #include <stdio.h> -@@ -139,17 +142,16 @@ ++#include <stdlib.h> + #include <string.h> + #include <unistd.h> + #include <sys/stat.h> +@@ -139,17 +143,16 @@ void do_file(char *file, FILE *fin) { } if(Hdrs) { |