Fri Sep 23 12:28:22 2022 UTC ()
scheme48: Honor LDFLAGS when linking, fixes RELRO builds


(nia)
diff -r1.15 -r1.16 pkgsrc/lang/scheme48/distinfo
diff -r1.2 -r1.3 pkgsrc/lang/scheme48/patches/patch-Makefile.in
cvs diff -r1.15 -r1.16 pkgsrc/lang/scheme48/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/scheme48/distinfo 2021/10/26 10:51:55 1.15
+++ pkgsrc/lang/scheme48/distinfo 2022/09/23 12:28:22 1.16
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.15 2021/10/26 10:51:55 nia Exp $ 1$NetBSD: distinfo,v 1.16 2022/09/23 12:28:22 nia Exp $
2 2
3BLAKE2s (scheme48-1.9.2.tgz) = e481de16dc11f6bb55ada8b95fb77cd95f60ec8e581a58d2c79d69f1aa068fd7 3BLAKE2s (scheme48-1.9.2.tgz) = e481de16dc11f6bb55ada8b95fb77cd95f60ec8e581a58d2c79d69f1aa068fd7
4SHA512 (scheme48-1.9.2.tgz) = a854e3c6f5b02c585fa125899dee276500b91e21cc773202fd4cb84f2e0566a0e19cc34b5f96a3265fab6bf06422e869a2e48433eb2d8fac83a1179fda62e2d1 4SHA512 (scheme48-1.9.2.tgz) = a854e3c6f5b02c585fa125899dee276500b91e21cc773202fd4cb84f2e0566a0e19cc34b5f96a3265fab6bf06422e869a2e48433eb2d8fac83a1179fda62e2d1
5Size (scheme48-1.9.2.tgz) = 3951356 bytes 5Size (scheme48-1.9.2.tgz) = 3951356 bytes
6SHA1 (patch-Makefile.in) = 1a4aa120fc1b6b3bb88242e4a40cd5dcca530930 6SHA1 (patch-Makefile.in) = 9295c6096eb01f49b4257db0e76b50d1caca2f26
cvs diff -r1.2 -r1.3 pkgsrc/lang/scheme48/patches/patch-Makefile.in (expand / switch to unified diff)

--- pkgsrc/lang/scheme48/patches/patch-Makefile.in 2015/11/14 14:14:46 1.2
+++ pkgsrc/lang/scheme48/patches/patch-Makefile.in 2022/09/23 12:28:22 1.3
@@ -1,27 +1,63 @@ @@ -1,27 +1,63 @@
1$NetBSD: patch-Makefile.in,v 1.2 2015/11/14 14:14:46 leot Exp $ 1$NetBSD: patch-Makefile.in,v 1.3 2022/09/23 12:28:22 nia Exp $
 2
 3Honor LDFLAGS when linking.
2 4
3Html documentation should be installed to a separate dir 5Html documentation should be installed to a separate dir
4 6
5--- Makefile.in.orig 2014-02-22 13:09:49.000000000 +0000 7--- Makefile.in.orig 2014-02-22 13:09:49.000000000 +0000
6+++ Makefile.in 8+++ Makefile.in
7@@ -48,6 +48,7 @@ mandir = @mandir@/man$(manext) 9@@ -48,6 +48,7 @@ mandir = @mandir@/man$(manext)
8 docdir = @docdir@ 10 docdir = @docdir@
9 datarootdir = @datarootdir@ 11 datarootdir = @datarootdir@
10 datadir = @datadir@ 12 datadir = @datadir@
11+htmldir = @htmldir@ 13+htmldir = @htmldir@
12  14
13 DYNAMIC_EXTERNALS_CFLAGS=@DYNAMIC_EXTERNALS_CFLAGS@ 15 DYNAMIC_EXTERNALS_CFLAGS=@DYNAMIC_EXTERNALS_CFLAGS@
14 DYNAMIC_EXTERNALS_LDFLAGS=@DYNAMIC_EXTERNALS_LDFLAGS@ 16 DYNAMIC_EXTERNALS_LDFLAGS=@DYNAMIC_EXTERNALS_LDFLAGS@
 17@@ -250,7 +251,7 @@ POSIX_OBJECTS = $(posix_dir)/user.o
 18 $(posix_dir)/errno.o $(posix_dir)/syslog.o
 19
 20 $(POSIX_EXTERNAL) : $(POSIX_OBJECTS)
 21- $(LD) -o $@ $(POSIX_OBJECTS) $(DYNAMIC_EXTERNALS_LDFLAGS_IN_PLACE)
 22+ $(CC) $(LDFLAGS) -o $@ $(POSIX_OBJECTS) $(DYNAMIC_EXTERNALS_LDFLAGS_IN_PLACE)
 23
 24
 25 # End of POSIX rules
 26@@ -270,21 +271,21 @@ $(r6rs_dir)/r6rs_externals.o: c/r6rs/r6r
 27 R6RS_OBJECTS = $(r6rs_dir)/ieee_bytevect.o $(r6rs_dir)/r6rs_externals.o
 28
 29 $(R6RS_EXTERNAL) : $(R6RS_OBJECTS)
 30- $(LD) -o $@ $(R6RS_OBJECTS) $(DYNAMIC_EXTERNALS_LDFLAGS_IN_PLACE)
 31+ $(CC) $(LDFLAGS) -o $@ $(R6RS_OBJECTS) $(DYNAMIC_EXTERNALS_LDFLAGS_IN_PLACE)
 32
 33
 34 c/srfi-27.o: c/srfi-27.c $(SCHEME48HS)
 35 $(CC) -c $(CPPFLAGS) $(DEFS) -I ./c -I$(srcdir)/c -I$(srcdir)/c/bibop $(CFLAGS) $(DYNAMIC_EXTERNALS_CFLAGS) -o $@ $<
 36
 37 $(SRFI_27_EXTERNAL) : c/srfi-27.o
 38- $(LD) -o $@ c/srfi-27.o $(DYNAMIC_EXTERNALS_LDFLAGS_IN_PLACE)
 39+ $(CC) $(LDFLAGS) -o $@ c/srfi-27.o $(DYNAMIC_EXTERNALS_LDFLAGS_IN_PLACE)
 40
 41
 42 c/ffi-test/ffi-test.o: c/ffi-test/ffi-test.c c/ffi-test/ffi-test.h $(SCHEME48HS)
 43 $(CC) -c $(CPPFLAGS) $(DEFS) -I ./c -I$(srcdir)/c -I$(srcdir)/c/bibop $(CFLAGS) $(DYNAMIC_EXTERNALS_CFLAGS) -o $@ $<
 44
 45 $(FFI_TEST_EXTERNAL) : c/ffi-test/ffi-test.o
 46- $(LD) -o $@ c/ffi-test/ffi-test.o $(DYNAMIC_EXTERNALS_LDFLAGS_IN_PLACE)
 47+ $(CC) $(LDFLAGS) -o $@ c/ffi-test/ffi-test.o $(DYNAMIC_EXTERNALS_LDFLAGS_IN_PLACE)
 48
 49
 50 # Native-code glue rules
15@@ -533,7 +534,7 @@ install-no-doc: enough dirs 51@@ -533,7 +534,7 @@ install-no-doc: enough dirs
16 # install the external modules 52 # install the external modules
17 $(INSTALL_PROGRAM) $(EXTERNALS) $(DESTDIR)$(LIB)/ 53 $(INSTALL_PROGRAM) $(EXTERNALS) $(DESTDIR)$(LIB)/
18 # install the documentation 54 # install the documentation
19- $(srcdir)/mkinstalldirs $(DESTDIR)$(docdir) 55- $(srcdir)/mkinstalldirs $(DESTDIR)$(docdir)
20+ $(srcdir)/mkinstalldirs $(DESTDIR)$(docdir) $(DESTDIR)$(htmldir) 56+ $(srcdir)/mkinstalldirs $(DESTDIR)$(docdir) $(DESTDIR)$(htmldir)
21 $(INSTALL_DATA) $(srcdir)/COPYING $(DESTDIR)$(docdir) 57 $(INSTALL_DATA) $(srcdir)/COPYING $(DESTDIR)$(docdir)
22  58
23 install-doc: dirs doc 59 install-doc: dirs doc
24@@ -542,7 +543,7 @@ install-doc: dirs doc 60@@ -542,7 +543,7 @@ install-doc: dirs doc
25 $(INSTALL_DATA) $(srcdir)/doc/manual.pdf $(DESTDIR)$(docdir) 61 $(INSTALL_DATA) $(srcdir)/doc/manual.pdf $(DESTDIR)$(docdir)
26 $(INSTALL_DATA) $(srcdir)/doc/manual.ps $(DESTDIR)$(docdir) 62 $(INSTALL_DATA) $(srcdir)/doc/manual.ps $(DESTDIR)$(docdir)
27 for f in $(srcdir)/doc/html/*; do \ 63 for f in $(srcdir)/doc/html/*; do \