diff options
| author | nia <nia@pkgsrc.org> | 2022-09-23 12:28:22 +0000 |
|---|---|---|
| committer | nia <nia@pkgsrc.org> | 2022-09-23 12:28:22 +0000 |
| commit | d30d8460984e482b3d67158017570241bedf6fcd (patch) | |
| tree | 15f15d6fd48c2c123e78963b2b2288e04b158418 | |
| parent | ff8e90d59bd03d47d770cefad43ec4bab00e4466 (diff) | |
| download | pkgsrc-d30d8460984e482b3d67158017570241bedf6fcd.tar.gz | |
scheme48: Honor LDFLAGS when linking, fixes RELRO builds
| -rw-r--r-- | lang/scheme48/distinfo | 4 | ||||
| -rw-r--r-- | lang/scheme48/patches/patch-Makefile.in | 38 |
2 files changed, 39 insertions, 3 deletions
diff --git a/lang/scheme48/distinfo b/lang/scheme48/distinfo index 2701bddd12d..ad0a75332c2 100644 --- a/lang/scheme48/distinfo +++ b/lang/scheme48/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.15 2021/10/26 10:51:55 nia Exp $ +$NetBSD: distinfo,v 1.16 2022/09/23 12:28:22 nia Exp $ BLAKE2s (scheme48-1.9.2.tgz) = e481de16dc11f6bb55ada8b95fb77cd95f60ec8e581a58d2c79d69f1aa068fd7 SHA512 (scheme48-1.9.2.tgz) = a854e3c6f5b02c585fa125899dee276500b91e21cc773202fd4cb84f2e0566a0e19cc34b5f96a3265fab6bf06422e869a2e48433eb2d8fac83a1179fda62e2d1 Size (scheme48-1.9.2.tgz) = 3951356 bytes -SHA1 (patch-Makefile.in) = 1a4aa120fc1b6b3bb88242e4a40cd5dcca530930 +SHA1 (patch-Makefile.in) = 9295c6096eb01f49b4257db0e76b50d1caca2f26 diff --git a/lang/scheme48/patches/patch-Makefile.in b/lang/scheme48/patches/patch-Makefile.in index d58226f56da..f2a2caacaad 100644 --- a/lang/scheme48/patches/patch-Makefile.in +++ b/lang/scheme48/patches/patch-Makefile.in @@ -1,4 +1,6 @@ -$NetBSD: patch-Makefile.in,v 1.2 2015/11/14 14:14:46 leot Exp $ +$NetBSD: patch-Makefile.in,v 1.3 2022/09/23 12:28:22 nia Exp $ + +Honor LDFLAGS when linking. Html documentation should be installed to a separate dir @@ -12,6 +14,40 @@ Html documentation should be installed to a separate dir DYNAMIC_EXTERNALS_CFLAGS=@DYNAMIC_EXTERNALS_CFLAGS@ DYNAMIC_EXTERNALS_LDFLAGS=@DYNAMIC_EXTERNALS_LDFLAGS@ +@@ -250,7 +251,7 @@ POSIX_OBJECTS = $(posix_dir)/user.o + $(posix_dir)/errno.o $(posix_dir)/syslog.o + + $(POSIX_EXTERNAL) : $(POSIX_OBJECTS) +- $(LD) -o $@ $(POSIX_OBJECTS) $(DYNAMIC_EXTERNALS_LDFLAGS_IN_PLACE) ++ $(CC) $(LDFLAGS) -o $@ $(POSIX_OBJECTS) $(DYNAMIC_EXTERNALS_LDFLAGS_IN_PLACE) + + + # End of POSIX rules +@@ -270,21 +271,21 @@ $(r6rs_dir)/r6rs_externals.o: c/r6rs/r6r + R6RS_OBJECTS = $(r6rs_dir)/ieee_bytevect.o $(r6rs_dir)/r6rs_externals.o + + $(R6RS_EXTERNAL) : $(R6RS_OBJECTS) +- $(LD) -o $@ $(R6RS_OBJECTS) $(DYNAMIC_EXTERNALS_LDFLAGS_IN_PLACE) ++ $(CC) $(LDFLAGS) -o $@ $(R6RS_OBJECTS) $(DYNAMIC_EXTERNALS_LDFLAGS_IN_PLACE) + + + c/srfi-27.o: c/srfi-27.c $(SCHEME48HS) + $(CC) -c $(CPPFLAGS) $(DEFS) -I ./c -I$(srcdir)/c -I$(srcdir)/c/bibop $(CFLAGS) $(DYNAMIC_EXTERNALS_CFLAGS) -o $@ $< + + $(SRFI_27_EXTERNAL) : c/srfi-27.o +- $(LD) -o $@ c/srfi-27.o $(DYNAMIC_EXTERNALS_LDFLAGS_IN_PLACE) ++ $(CC) $(LDFLAGS) -o $@ c/srfi-27.o $(DYNAMIC_EXTERNALS_LDFLAGS_IN_PLACE) + + + c/ffi-test/ffi-test.o: c/ffi-test/ffi-test.c c/ffi-test/ffi-test.h $(SCHEME48HS) + $(CC) -c $(CPPFLAGS) $(DEFS) -I ./c -I$(srcdir)/c -I$(srcdir)/c/bibop $(CFLAGS) $(DYNAMIC_EXTERNALS_CFLAGS) -o $@ $< + + $(FFI_TEST_EXTERNAL) : c/ffi-test/ffi-test.o +- $(LD) -o $@ c/ffi-test/ffi-test.o $(DYNAMIC_EXTERNALS_LDFLAGS_IN_PLACE) ++ $(CC) $(LDFLAGS) -o $@ c/ffi-test/ffi-test.o $(DYNAMIC_EXTERNALS_LDFLAGS_IN_PLACE) + + + # Native-code glue rules @@ -533,7 +534,7 @@ install-no-doc: enough dirs # install the external modules $(INSTALL_PROGRAM) $(EXTERNALS) $(DESTDIR)$(LIB)/ |