CVS commit: pkgsrc/lang/rexx-regina

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Thu May  5 13:49:41 UTC 2022

Modified Files:
        pkgsrc/lang/rexx-regina: distinfo
        pkgsrc/lang/rexx-regina/patches: patch-aa

Log Message:
rexx-regina: Respect LDFLAGS when linking


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/lang/rexx-regina/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/rexx-regina/patches/patch-aa

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/rexx-regina/distinfo
diff -u pkgsrc/lang/rexx-regina/distinfo:1.7 pkgsrc/lang/rexx-regina/distinfo:1.8
--- pkgsrc/lang/rexx-regina/distinfo:1.7        Tue Oct 26 10:51:53 2021
+++ pkgsrc/lang/rexx-regina/distinfo    Thu May  5 13:49:41 2022
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.7 2021/10/26 10:51:53 nia Exp $
+$NetBSD: distinfo,v 1.8 2022/05/05 13:49:41 nia Exp $
 
 BLAKE2s (regina301.zip) = 527b9e194f531297f70eae2af5d83f31ea03a4d8d68d05ff5eb1cc21fe073239
 SHA512 (regina301.zip) = ddf984c4a777728bd1043ab6357c3d5f2a7bc6828312afa6e39562499b9e08e2bc203e95bbef9965691553a6e5a37124521f1a27dfb5d06816255c53d4f23167
 Size (regina301.zip) = 871017 bytes
-SHA1 (patch-aa) = 9c6f6bd372afd4278afe81e1fcbaed2ba40eb047
+SHA1 (patch-aa) = 83e2f07c5d936607ff764eb6a5ff960078d03c03
 SHA1 (patch-ab) = 7cc785ea3b37d67a5ccecea64b63787c7b0f2ff6

Index: pkgsrc/lang/rexx-regina/patches/patch-aa
diff -u pkgsrc/lang/rexx-regina/patches/patch-aa:1.2 pkgsrc/lang/rexx-regina/patches/patch-aa:1.3
--- pkgsrc/lang/rexx-regina/patches/patch-aa:1.2        Tue Dec 29 23:34:54 2015
+++ pkgsrc/lang/rexx-regina/patches/patch-aa    Thu May  5 13:49:41 2022
@@ -1,10 +1,38 @@
-$NetBSD: patch-aa,v 1.2 2015/12/29 23:34:54 dholland Exp $
+$NetBSD: patch-aa,v 1.3 2022/05/05 13:49:41 nia Exp $
 
 Don't use the root /etc. XXX: it shouldn't use the etc in PREFIX either...
 
---- configure  2002/09/02 17:06:11     1.1
-+++ configure  2002/09/02 17:07:26
-@@ -3598,7 +3598,7 @@
+--- configure.orig     2002-05-19 10:06:07.000000000 +0000
++++ configure
+@@ -3360,10 +3360,10 @@ return(0);
+ }
+ EOF
+ if { (eval echo configure:3363: \"$mh_compile\") 1>&5; (eval $mh_compile) 2>&5; } && test -s conftest.o; then
+-        mh_dyn_link='ld -shared -o conftest.so.1.0 conftest.o -lc 1>&5'
++        mh_dyn_link='${CC} ${LDFLAGS} -shared -o conftest.so.1.0 conftest.o -lc 1>&5'
+ #       mh_dyn_link='${CC} -Wl,-shared -o conftest.so.1.0 conftest.o -lc 1>&AC_FD_CC'
+         if { (eval echo configure:3366: \"$mh_dyn_link\") 1>&5; (eval $mh_dyn_link) 2>&5; } && test -s conftest.so.1.0; then
+-                SHL_LD="ld -shared -o ${SHLPRE}${SHLFILE}${SHLPST} "'$('SHOFILES')'" -lc"
++                SHL_LD="${CC} ${LDFLAGS} -shared -o ${SHLPRE}${SHLFILE}${SHLPST} "'$('SHOFILES')'" -lc"
+ #               SHL_LD="${CC} -Wl,-shared -o ${SHLPRE}${SHLFILE}${SHLPST} "'$('SHOFILES')'" -lc"
+         else
+                 mh_dyn_link='ld -G -o conftest.so.1.0 conftest.o 1>&5'
+@@ -3421,11 +3421,11 @@ return(0);
+ }
+ EOF
+ if { (eval echo configure:3424: \"$mh_compile\") 1>&5; (eval $mh_compile) 2>&5; } && test -s conftest.o; then
+-        mh_dyn_link='ld -shared -o conftest.rxlib conftest.o -lc 1>&5'
++        mh_dyn_link='${CC} ${LDFLAGS} -shared -o conftest.rxlib conftest.o -lc 1>&5'
+ #       mh_dyn_link='${CC} -Wl,-shared -o conftest.rxlib conftest.o -lc 1>&AC_FD_CC'
+         if { (eval echo configure:3427: \"$mh_dyn_link\") 1>&5; (eval $mh_dyn_link) 2>&5; } && test -s conftest.rxlib; then
+-                LD_RXLIB_A1="ld -shared"
+-                LD_RXLIB_A2="ld -shared"
++                LD_RXLIB_A1="${CC} ${LDFLAGS} -shared"
++                LD_RXLIB_A2="${CC} ${LDFLAGS} -shared"
+ #               LD_RXLIB1="${CC} -Wl,-shared"
+                 LD_RXLIB_B1="-L. -l${SHLFILE}"
+                 LD_RXLIB_B2="-L. -l${SHLFILE}"
+@@ -3598,7 +3598,7 @@ cat >> confdefs.h <<\EOF
  EOF