summaryrefslogtreecommitdiff
path: root/editors/pico
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2017-11-30 15:16:25 +0000
committerwiz <wiz@pkgsrc.org>2017-11-30 15:16:25 +0000
commitf689e1e5a31809c53f62abd86368acac9d25fa66 (patch)
tree75df5e8f7582e123a1f52ce2e3bc05ffcad55fa8 /editors/pico
parent7ffe11b6e28ad0dd43920711fa16855f395c1504 (diff)
downloadpkgsrc-f689e1e5a31809c53f62abd86368acac9d25fa66.tar.gz
pico: pass LDFLAGS to linker.
Fixes RELRO build.
Diffstat (limited to 'editors/pico')
-rw-r--r--editors/pico/distinfo4
-rw-r--r--editors/pico/patches/patch-aa16
2 files changed, 10 insertions, 10 deletions
diff --git a/editors/pico/distinfo b/editors/pico/distinfo
index 174c0cb87ec..5a4abafcfac 100644
--- a/editors/pico/distinfo
+++ b/editors/pico/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.26 2015/11/03 03:32:20 agc Exp $
+$NetBSD: distinfo,v 1.27 2017/11/30 15:16:25 wiz Exp $
SHA1 (pine4.64.tar.bz2) = b88aeb64ec2fa30bbb38fda3a051d98dc0e19c5e
RMD160 (pine4.64.tar.bz2) = 8661cd3c0875e46c8cd5eafa7c7c964f79a3b3fd
SHA512 (pine4.64.tar.bz2) = a5d62ad26fcd6d832441416dd3f781637dde61899cac5018e07232a7f80461f78d2efb4538be06e03792c1950181242fe0b1a5dc89737e05ea525cc7d37614c6
Size (pine4.64.tar.bz2) = 3110790 bytes
-SHA1 (patch-aa) = 4bc4703182de5bb8ddca77339ca163b9a61f94fb
+SHA1 (patch-aa) = 7d3f25c620e87838b364553cafd0e181ebd95e88
SHA1 (patch-ac) = a6de88e9ab5f1464d58476cbbeb0579938d51427
SHA1 (patch-ad) = a5145664372b0ad308a0ee2501211e927d343971
SHA1 (patch-ae) = c73be96a2b97f70be8e2f1ccb12767cab35ab2f7
diff --git a/editors/pico/patches/patch-aa b/editors/pico/patches/patch-aa
index 1d7115aa5e9..84fa94603b5 100644
--- a/editors/pico/patches/patch-aa
+++ b/editors/pico/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.17 2009/11/26 00:10:42 joerg Exp $
+$NetBSD: patch-aa,v 1.18 2017/11/30 15:16:25 wiz Exp $
---- pico/makefile.neb.orig 2001-10-24 00:19:07.000000000 +0200
-+++ pico/makefile.neb 2003-07-28 14:04:16.000000000 +0200
-@@ -32,16 +32,12 @@
+--- pico/makefile.neb.orig 2001-10-23 22:18:36.000000000 +0000
++++ pico/makefile.neb
+@@ -32,16 +32,12 @@ LN= ln -s
MAKE= make
OPTIMIZE= # -O
PROFILE= # -pg
@@ -20,7 +20,7 @@ $NetBSD: patch-aa,v 1.17 2009/11/26 00:10:42 joerg Exp $
LIBS= $(EXTRALDFLAGS) -ltermcap
OFILES= attach.o basic.o bind.o browse.o buffer.o \
-@@ -55,17 +51,17 @@
+@@ -55,17 +51,17 @@ HFILES= headers.h estruct.h edef.h efun
# dependencies for the Unix versions of pico and libpico.a
#
all: pico pilot
@@ -29,17 +29,17 @@ $NetBSD: patch-aa,v 1.17 2009/11/26 00:10:42 joerg Exp $
pico: main.o
- $(CC) $(CFLAGS) main.o libpico.a $(LIBS) -o pico
-+ $(LDCC) $(CFLAGS) main.o libpico.la $(LIBS) -o pico
++ $(LDCC) $(LDFLAGS) $(CFLAGS) main.o libpico.la $(LIBS) -o pico
pilot: pilot.o
- $(CC) $(CFLAGS) pilot.o libpico.a $(LIBS) -o pilot
-+ $(LDCC) $(CFLAGS) pilot.o libpico.la $(LIBS) -o pilot
++ $(LDCC) $(LDFLAGS) $(CFLAGS) pilot.o libpico.la $(LIBS) -o pilot
-libpico.a: $(OFILES)
- $(LIBCMD) $(LIBARGS) libpico.a $(OFILES)
- $(RANLIB) libpico.a
+libpico.la: $(OFILES)
-+ $(LDCC) -o libpico.la $(OFILES:.o=.lo) -rpath $(PREFIX)/lib \
++ $(LDCC) $(LDFLAGS) -o libpico.la $(OFILES:.o=.lo) -rpath $(PREFIX)/lib \
+ -version-info 6:0
clean: