[pkgsrc/trunk]: pkgsrc Honor LDFLAGS. Fixes RELRO build.

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc Honor LDFLAGS. Fixes RELRO build.
From: wiz <wiz%pkgsrc.org@localhost>
Date: Wed, 15 Jan 2020 07:28:02 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/aef70e820233
branches:  trunk
changeset: 364942:aef70e820233
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Fri Jul 07 11:19:44 2017 +0000

description:
Honor LDFLAGS. Fixes RELRO build.

diffstat:

 converters/uulib/distinfo                           |   4 ++--
 converters/uulib/patches/patch-aa                   |   4 ++--
 databases/hiredis/distinfo                          |   4 ++--
 databases/hiredis/patches/patch-Makefile            |   5 +++--
 net/netcat/distinfo                                 |   6 +++---
 net/netcat/patches/patch-ae                         |   4 ++--
 net/netcat/patches/patch-af                         |   8 ++++----
 textproc/ispell/distinfo                            |   3 ++-
 textproc/ispell/patches/patch-deformatters_Makefile |  21 +++++++++++++++++++++
 9 files changed, 41 insertions(+), 18 deletions(-)

diffs (164 lines):

diff -r 00c09c0044d9 -r aef70e820233 converters/uulib/distinfo
--- a/converters/uulib/distinfo Fri Jul 07 10:14:06 2017 +0000
+++ b/converters/uulib/distinfo Fri Jul 07 11:19:44 2017 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.13 2015/11/03 01:43:55 agc Exp $
+$NetBSD: distinfo,v 1.14 2017/07/07 11:19:44 wiz Exp $
 
 SHA1 (uudeview-0.5.20.tar.gz) = 2c6ab7d355b545218bd0877d598bd5327d9fd125
 RMD160 (uudeview-0.5.20.tar.gz) = 9bb52fa3ad4979383ff16d1e8d8a302c5c794c66
 SHA512 (uudeview-0.5.20.tar.gz) = d080e9c3940bad7bacd28457f21133056384a01e33ba014de42502d23f81f2c7f5fa7f6c472ce9f37bec2edb8e18d27135bf18426cf2f23188a3683558e1721c
 Size (uudeview-0.5.20.tar.gz) = 261574 bytes
-SHA1 (patch-aa) = 0d6f07b3196405f357ec529094460a409cb964ee
+SHA1 (patch-aa) = 2f495c982bb8a96ffd60f1bcd4ce65e6c226083c
 SHA1 (patch-ab) = f23ca7945a0697dc8e49ba9c7765bfa655ed8566
 SHA1 (patch-ac) = e167fedf6ca5933d027407715c4275d60d1ee795
diff -r 00c09c0044d9 -r aef70e820233 converters/uulib/patches/patch-aa
--- a/converters/uulib/patches/patch-aa Fri Jul 07 10:14:06 2017 +0000
+++ b/converters/uulib/patches/patch-aa Fri Jul 07 11:19:44 2017 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.6 2009/09/09 17:16:36 joerg Exp $
+$NetBSD: patch-aa,v 1.7 2017/07/07 11:19:44 wiz Exp $
 
 --- uulib/Makefile.in.orig     2002-03-11 03:15:46.000000000 -0600
 +++ uulib/Makefile.in
@@ -38,7 +38,7 @@
        rm -f $@
 -      ar r $@ $(UULIB_OBJ)
 -      -$(RANLIB) $@
-+      $(LIBTOOL) --mode=link @CC@ -o libuu.la $(UULIB_OBJ:.o=.lo) -rpath $(PREFIX)/lib \
++      $(LIBTOOL) --mode=link @CC@ $(LDFLAGS) -o libuu.la $(UULIB_OBJ:.o=.lo) -rpath $(PREFIX)/lib \
 +              -version-info 2:0
  
  .c.o:
diff -r 00c09c0044d9 -r aef70e820233 databases/hiredis/distinfo
--- a/databases/hiredis/distinfo        Fri Jul 07 10:14:06 2017 +0000
+++ b/databases/hiredis/distinfo        Fri Jul 07 11:19:44 2017 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.5 2015/11/29 18:35:37 wiedi Exp $
+$NetBSD: distinfo,v 1.6 2017/07/07 11:21:12 wiz Exp $
 
 SHA1 (hiredis-0.13.3.tar.gz) = be6f1c50fc4d649dd2924f0afecc0a1705dbe0d3
 RMD160 (hiredis-0.13.3.tar.gz) = 0183a5bfffa09fa51bc89667081d89c619b85037
 SHA512 (hiredis-0.13.3.tar.gz) = 0d8b71d5ee4105e8aaeeee308795afc2c1f60a04b0bfe8ae873d800a0c157882ec307efa04a8d0e63b538fd3fc3f88eedf4d46cb87c8937e2403927aeb7e434c
 Size (hiredis-0.13.3.tar.gz) = 58291 bytes
-SHA1 (patch-Makefile) = f0c189ce10ed32d9a31a30b2067a03460e852fd1
+SHA1 (patch-Makefile) = 28334ea2818f494061c4d663c213a01e793d7126
diff -r 00c09c0044d9 -r aef70e820233 databases/hiredis/patches/patch-Makefile
--- a/databases/hiredis/patches/patch-Makefile  Fri Jul 07 10:14:06 2017 +0000
+++ b/databases/hiredis/patches/patch-Makefile  Fri Jul 07 11:19:44 2017 +0000
@@ -1,4 +1,5 @@
-$NetBSD: patch-Makefile,v 1.3 2015/09/02 15:12:37 wiedi Exp $
+$NetBSD: patch-Makefile,v 1.4 2017/07/07 11:21:12 wiz Exp $
+
 use libtool
 
 --- Makefile.orig      2015-08-25 12:16:20.000000000 +0000
@@ -25,7 +26,7 @@
        $(STLIB_MAKE_CMD) $(OBJ)
  
 +$(LANAME): $(OBJ)
-+      $(LIBTOOL) --mode=link $(CC) -o $(LANAME) $(OBJ:.o=.lo) \
++      $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $(LANAME) $(OBJ:.o=.lo) \
 +              -rpath $(PREFIX)/lib \
 +              -version-number $(HIREDIS_MAJOR):$(HIREDIS_MINOR)
 +
diff -r 00c09c0044d9 -r aef70e820233 net/netcat/distinfo
--- a/net/netcat/distinfo       Fri Jul 07 10:14:06 2017 +0000
+++ b/net/netcat/distinfo       Fri Jul 07 11:19:44 2017 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2015/11/04 00:35:15 agc Exp $
+$NetBSD: distinfo,v 1.13 2017/07/07 11:23:01 wiz Exp $
 
 SHA1 (nc110.tgz) = f8ec3a39796b141b6654d39b7957b863c7f79a95
 RMD160 (nc110.tgz) = 3e891fa094d921940e53035fb6721e2f0c04efdb
@@ -8,5 +8,5 @@
 SHA1 (patch-ab) = 73990f9a87b04fffb22b94873e3225bd8ee496b5
 SHA1 (patch-ac) = 8b0c41953ab0237304a31fb999e27a51df8cb0a9
 SHA1 (patch-ad) = 0e6e3234a1abbec1151705a0c21bc1b7a87044f4
-SHA1 (patch-ae) = f76fb4b4c593a7951d0c62745f599ef747360514
-SHA1 (patch-af) = 45b3824ff84c2557b0016d97b0309d5c8b597690
+SHA1 (patch-ae) = 80c8fd9b6b98ff026e65a90e5360c12c16ce86db
+SHA1 (patch-af) = 379c35bd9bd4b2526eace0c8e95c9147f9b13dce
diff -r 00c09c0044d9 -r aef70e820233 net/netcat/patches/patch-ae
--- a/net/netcat/patches/patch-ae       Fri Jul 07 10:14:06 2017 +0000
+++ b/net/netcat/patches/patch-ae       Fri Jul 07 11:19:44 2017 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.7 2011/01/13 15:09:58 pooka Exp $
+$NetBSD: patch-ae,v 1.8 2017/07/07 11:23:01 wiz Exp $
 
 --- Makefile.orig      Tue Mar 19 19:16:06 1996
 +++ Makefile   Sat Nov 22 17:32:15 2003
@@ -20,7 +20,7 @@
  
  nc:   netcat.c
 -      $(LD) $(DFLAGS) $(XFLAGS) $(STATIC) -o nc netcat.c $(XLIBS)
-+      $(CC) $(CFLAGS) $(DFLAGS) $(XFLAGS) -o nc netcat.c $(XLIBS)
++      $(CC) $(CFLAGS) $(LDFLAGS) $(DFLAGS) $(XFLAGS) -o nc netcat.c $(XLIBS)
  
  nc-dos:
        @echo "DOS?!  Maybe someday, but not now"
diff -r 00c09c0044d9 -r aef70e820233 net/netcat/patches/patch-af
--- a/net/netcat/patches/patch-af       Fri Jul 07 10:14:06 2017 +0000
+++ b/net/netcat/patches/patch-af       Fri Jul 07 11:19:44 2017 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.1 2003/04/30 04:08:27 grant Exp $
+$NetBSD: patch-af,v 1.2 2017/07/07 11:23:01 wiz Exp $
 
 --- data/Makefile.orig Thu Mar 21 07:14:44 1996
 +++ data/Makefile
@@ -7,12 +7,12 @@
  
  data: data.c
 -      cc -s -O -o data data.c
-+      $(CC) $(CFLAGS) -s -o data data.c
++      $(CC) $(CFLAGS) $(LDFLAGS) -s -o data data.c
  rservice:     rservice.c
 -      cc -s -O -o rservice rservice.c
-+      $(CC) $(CFLAGS) -s -o rservice rservice.c
++      $(CC) $(CFLAGS) $(LDFLAGS) -s -o rservice rservice.c
  xor:  xor.c
 -      cc -s -O -o xor xor.c
-+      $(CC) $(CFLAGS) -s -o xor xor.c
++      $(CC) $(CFLAGS) $(LDFLAGS) -s -o xor xor.c
  clean:
        rm -f *.o data rservice xor
diff -r 00c09c0044d9 -r aef70e820233 textproc/ispell/distinfo
--- a/textproc/ispell/distinfo  Fri Jul 07 10:14:06 2017 +0000
+++ b/textproc/ispell/distinfo  Fri Jul 07 11:19:44 2017 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2015/11/04 01:59:36 agc Exp $
+$NetBSD: distinfo,v 1.6 2017/07/07 11:28:36 wiz Exp $
 
 SHA1 (ispell-3.4.00.tar.gz) = 6138ab935f0261be8162e3cdc07c127d53555837
 RMD160 (ispell-3.4.00.tar.gz) = c6a2a6d6dd65782d7c3fdf90968e61a5091b616c
@@ -12,3 +12,4 @@
 SHA1 (patch-ai) = 1fbf9385818e0a0fcd4049d0407212b1456d2744
 SHA1 (patch-al) = ea63fc7dbc2200794157d9be781210cd8a4e671f
 SHA1 (patch-ar) = c5082129f55fb232db34e0796423e60fcd4ed5c2
+SHA1 (patch-deformatters_Makefile) = a66a43f679491df718149c0b6db36ed0f9962535
diff -r 00c09c0044d9 -r aef70e820233 textproc/ispell/patches/patch-deformatters_Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/textproc/ispell/patches/patch-deformatters_Makefile       Fri Jul 07 11:19:44 2017 +0000
@@ -0,0 +1,21 @@
+$NetBSD: patch-deformatters_Makefile,v 1.1 2017/07/07 11:28:36 wiz Exp $
+
+Honor LDFLAGS.
+
+--- deformatters/Makefile.orig 2015-02-08 09:11:13.000000000 +0000
++++ deformatters/Makefile      2017-07-07 11:26:34.426979435 +0000
+@@ -77,12 +77,12 @@
+ defmt-c: defmt-c.o
+       @. ../config.sh; \
+         set -x; \
+-        $$CC $$CFLAGS -o $@ $<
++        $$CC $$CFLAGS $$LDFLAGS -o $@ $<
+ 
+ defmt-sh: defmt-sh.o
+       @. ../config.sh; \
+         set -x; \
+-        $$CC $$CFLAGS -o $@ $<
++        $$CC $$CFLAGS $$LDFLAGS -o $@ $<
+ 
+ .c.o:
+       @. ../config.sh; \
Prev by Date: [pkgsrc/trunk]: pkgsrc/textproc/texi2mdoc Honor LDFLAGS. Fixes RELRO build.
Next by Date: [pkgsrc/trunk]: pkgsrc/doc Updated x11/modular-xorg-server to 1.19.3nb1
Previous by Thread: [pkgsrc/trunk]: pkgsrc/textproc/texi2mdoc Honor LDFLAGS. Fixes RELRO build.
Next by Thread: [pkgsrc/trunk]: pkgsrc/doc Updated x11/modular-xorg-server to 1.19.3nb1
Indexes:
Home | Main Index | Thread Index | Old Index