Skip to content

Commit d310d44

Browse files
author
wiz
committed
Honor LDFLAGS. Fixes RELRO build.
1 parent 5af6686 commit d310d44

9 files changed

Lines changed: 41 additions & 18 deletions

File tree

‎converters/uulib/distinfo‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
$NetBSD: distinfo,v 1.13 2015/11/03 01:43:55 agc Exp $
1+
$NetBSD: distinfo,v 1.14 2017/07/07 11:19:44 wiz Exp $
22

33
SHA1 (uudeview-0.5.20.tar.gz) = 2c6ab7d355b545218bd0877d598bd5327d9fd125
44
RMD160 (uudeview-0.5.20.tar.gz) = 9bb52fa3ad4979383ff16d1e8d8a302c5c794c66
55
SHA512 (uudeview-0.5.20.tar.gz) = d080e9c3940bad7bacd28457f21133056384a01e33ba014de42502d23f81f2c7f5fa7f6c472ce9f37bec2edb8e18d27135bf18426cf2f23188a3683558e1721c
66
Size (uudeview-0.5.20.tar.gz) = 261574 bytes
7-
SHA1 (patch-aa) = 0d6f07b3196405f357ec529094460a409cb964ee
7+
SHA1 (patch-aa) = 2f495c982bb8a96ffd60f1bcd4ce65e6c226083c
88
SHA1 (patch-ab) = f23ca7945a0697dc8e49ba9c7765bfa655ed8566
99
SHA1 (patch-ac) = e167fedf6ca5933d027407715c4275d60d1ee795

‎converters/uulib/patches/patch-aa‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
$NetBSD: patch-aa,v 1.6 2009/09/09 17:16:36 joerg Exp $
1+
$NetBSD: patch-aa,v 1.7 2017/07/07 11:19:44 wiz Exp $
22

33
--- uulib/Makefile.in.orig 2002-03-11 03:15:46.000000000 -0600
44
+++ uulib/Makefile.in
@@ -38,7 +38,7 @@ $NetBSD: patch-aa,v 1.6 2009/09/09 17:16:36 joerg Exp $
3838
rm -f $@
3939
- ar r $@ $(UULIB_OBJ)
4040
- -$(RANLIB) $@
41-
+ $(LIBTOOL) --mode=link @CC@ -o libuu.la $(UULIB_OBJ:.o=.lo) -rpath $(PREFIX)/lib \
41+
+ $(LIBTOOL) --mode=link @CC@ $(LDFLAGS) -o libuu.la $(UULIB_OBJ:.o=.lo) -rpath $(PREFIX)/lib \
4242
+ -version-info 2:0
4343

4444
.c.o:

‎databases/hiredis/distinfo‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
$NetBSD: distinfo,v 1.5 2015/11/29 18:35:37 wiedi Exp $
1+
$NetBSD: distinfo,v 1.6 2017/07/07 11:21:12 wiz Exp $
22

33
SHA1 (hiredis-0.13.3.tar.gz) = be6f1c50fc4d649dd2924f0afecc0a1705dbe0d3
44
RMD160 (hiredis-0.13.3.tar.gz) = 0183a5bfffa09fa51bc89667081d89c619b85037
55
SHA512 (hiredis-0.13.3.tar.gz) = 0d8b71d5ee4105e8aaeeee308795afc2c1f60a04b0bfe8ae873d800a0c157882ec307efa04a8d0e63b538fd3fc3f88eedf4d46cb87c8937e2403927aeb7e434c
66
Size (hiredis-0.13.3.tar.gz) = 58291 bytes
7-
SHA1 (patch-Makefile) = f0c189ce10ed32d9a31a30b2067a03460e852fd1
7+
SHA1 (patch-Makefile) = 28334ea2818f494061c4d663c213a01e793d7126

‎databases/hiredis/patches/patch-Makefile‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
$NetBSD: patch-Makefile,v 1.3 2015/09/02 15:12:37 wiedi Exp $
1+
$NetBSD: patch-Makefile,v 1.4 2017/07/07 11:21:12 wiz Exp $
2+
23
use libtool
34

45
--- Makefile.orig 2015-08-25 12:16:20.000000000 +0000
@@ -25,7 +26,7 @@ use libtool
2526
$(STLIB_MAKE_CMD) $(OBJ)
2627

2728
+$(LANAME): $(OBJ)
28-
+ $(LIBTOOL) --mode=link $(CC) -o $(LANAME) $(OBJ:.o=.lo) \
29+
+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $(LANAME) $(OBJ:.o=.lo) \
2930
+ -rpath $(PREFIX)/lib \
3031
+ -version-number $(HIREDIS_MAJOR):$(HIREDIS_MINOR)
3132
+

‎net/netcat/distinfo‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
$NetBSD: distinfo,v 1.12 2015/11/04 00:35:15 agc Exp $
1+
$NetBSD: distinfo,v 1.13 2017/07/07 11:23:01 wiz Exp $
22

33
SHA1 (nc110.tgz) = f8ec3a39796b141b6654d39b7957b863c7f79a95
44
RMD160 (nc110.tgz) = 3e891fa094d921940e53035fb6721e2f0c04efdb
@@ -8,5 +8,5 @@ SHA1 (patch-aa) = 44dc8cf9072a1c127925a4efed6bb7f1428360bc
88
SHA1 (patch-ab) = 73990f9a87b04fffb22b94873e3225bd8ee496b5
99
SHA1 (patch-ac) = 8b0c41953ab0237304a31fb999e27a51df8cb0a9
1010
SHA1 (patch-ad) = 0e6e3234a1abbec1151705a0c21bc1b7a87044f4
11-
SHA1 (patch-ae) = f76fb4b4c593a7951d0c62745f599ef747360514
12-
SHA1 (patch-af) = 45b3824ff84c2557b0016d97b0309d5c8b597690
11+
SHA1 (patch-ae) = 80c8fd9b6b98ff026e65a90e5360c12c16ce86db
12+
SHA1 (patch-af) = 379c35bd9bd4b2526eace0c8e95c9147f9b13dce

‎net/netcat/patches/patch-ae‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
$NetBSD: patch-ae,v 1.7 2011/01/13 15:09:58 pooka Exp $
1+
$NetBSD: patch-ae,v 1.8 2017/07/07 11:23:01 wiz Exp $
22

33
--- Makefile.orig Tue Mar 19 19:16:06 1996
44
+++ Makefile Sat Nov 22 17:32:15 2003
@@ -20,7 +20,7 @@ $NetBSD: patch-ae,v 1.7 2011/01/13 15:09:58 pooka Exp $
2020

2121
nc: netcat.c
2222
- $(LD) $(DFLAGS) $(XFLAGS) $(STATIC) -o nc netcat.c $(XLIBS)
23-
+ $(CC) $(CFLAGS) $(DFLAGS) $(XFLAGS) -o nc netcat.c $(XLIBS)
23+
+ $(CC) $(CFLAGS) $(LDFLAGS) $(DFLAGS) $(XFLAGS) -o nc netcat.c $(XLIBS)
2424

2525
nc-dos:
2626
@echo "DOS?! Maybe someday, but not now"

‎net/netcat/patches/patch-af‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
$NetBSD: patch-af,v 1.1 2003/04/30 04:08:27 grant Exp $
1+
$NetBSD: patch-af,v 1.2 2017/07/07 11:23:01 wiz Exp $
22

33
--- data/Makefile.orig Thu Mar 21 07:14:44 1996
44
+++ data/Makefile
@@ -7,12 +7,12 @@ $NetBSD: patch-af,v 1.1 2003/04/30 04:08:27 grant Exp $
77

88
data: data.c
99
- cc -s -O -o data data.c
10-
+ $(CC) $(CFLAGS) -s -o data data.c
10+
+ $(CC) $(CFLAGS) $(LDFLAGS) -s -o data data.c
1111
rservice: rservice.c
1212
- cc -s -O -o rservice rservice.c
13-
+ $(CC) $(CFLAGS) -s -o rservice rservice.c
13+
+ $(CC) $(CFLAGS) $(LDFLAGS) -s -o rservice rservice.c
1414
xor: xor.c
1515
- cc -s -O -o xor xor.c
16-
+ $(CC) $(CFLAGS) -s -o xor xor.c
16+
+ $(CC) $(CFLAGS) $(LDFLAGS) -s -o xor xor.c
1717
clean:
1818
rm -f *.o data rservice xor

‎textproc/ispell/distinfo‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
$NetBSD: distinfo,v 1.5 2015/11/04 01:59:36 agc Exp $
1+
$NetBSD: distinfo,v 1.6 2017/07/07 11:28:36 wiz Exp $
22

33
SHA1 (ispell-3.4.00.tar.gz) = 6138ab935f0261be8162e3cdc07c127d53555837
44
RMD160 (ispell-3.4.00.tar.gz) = c6a2a6d6dd65782d7c3fdf90968e61a5091b616c
@@ -12,3 +12,4 @@ SHA1 (patch-ae) = adc803bd66f62236a2b879713f326b4c7ac7199f
1212
SHA1 (patch-ai) = 1fbf9385818e0a0fcd4049d0407212b1456d2744
1313
SHA1 (patch-al) = ea63fc7dbc2200794157d9be781210cd8a4e671f
1414
SHA1 (patch-ar) = c5082129f55fb232db34e0796423e60fcd4ed5c2
15+
SHA1 (patch-deformatters_Makefile) = a66a43f679491df718149c0b6db36ed0f9962535

‎textproc/ispell/patches/patch-deformatters_Makefile‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
$NetBSD: patch-deformatters_Makefile,v 1.1 2017/07/07 11:28:36 wiz Exp $
2+
3+
Honor LDFLAGS.
4+
5+
--- deformatters/Makefile.orig 2015-02-08 09:11:13.000000000 +0000
6+
+++ deformatters/Makefile 2017-07-07 11:26:34.426979435 +0000
7+
@@ -77,12 +77,12 @@
8+
defmt-c: defmt-c.o
9+
@. ../config.sh; \
10+
set -x; \
11+
- $$CC $$CFLAGS -o $@ $<
12+
+ $$CC $$CFLAGS $$LDFLAGS -o $@ $<
13+
14+
defmt-sh: defmt-sh.o
15+
@. ../config.sh; \
16+
set -x; \
17+
- $$CC $$CFLAGS -o $@ $<
18+
+ $$CC $$CFLAGS $$LDFLAGS -o $@ $<
19+
20+
.c.o:
21+
@. ../config.sh; \

0 commit comments

Comments
 (0)