Re: parallel/pvm3 on NetBSD-current

[Havard Eidnes <he%NetBSD.org@localhost>]

OK, found a fix which works and doesn't do CHECK_RELRO=no,
attached.

Regards,

- Håvard

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/parallel/pvm3/Makefile,v
retrieving revision 1.65
diff -u -p -r1.65 Makefile
--- Makefile	20 Mar 2019 10:55:21 -0000	1.65
+++ Makefile	26 Jun 2022 22:49:56 -0000
@@ -37,6 +37,9 @@ MAKE_ENV+=		PVMLIB_VER=3:4
 MAKE_ENV+=		PVM_DIR=${PVM_DIR:Q}
 BUILD_TARGET=		all install
 
+FFLAGS+=		-fallow-argument-mismatch
+#CHECK_RELRO=		no
+
 REPLACE_CSH=		${WRKSRC}/lib/debugger ${WRKSRC}/lib/debugger2
 
 # Set PVM_ARCH to the correct value for this machine platform.
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/parallel/pvm3/distinfo,v
retrieving revision 1.33
diff -u -p -r1.33 distinfo
--- distinfo	26 Oct 2021 11:10:38 -0000	1.33
+++ distinfo	26 Jun 2022 22:49:56 -0000
@@ -48,8 +48,8 @@ SHA1 (patch-bq) = 404d9b54968945019767bd
 SHA1 (patch-br) = bb3431cd07153d9a8d42ca0fed8c55282a21977e
 SHA1 (patch-bs) = 0f982d32bc145aae66fcae721c21560417ed304f
 SHA1 (patch-bt) = aa57072e31b8c717eff64b57a5332b58f214b109
-SHA1 (patch-bu) = a8410e44d6d18949fde5afa57780adc8e168d559
-SHA1 (patch-bv) = faff2d0c965ece536942e97c12fad47a42253d3e
+SHA1 (patch-bu) = 27969bdfef30bd3a80688252fef639b9fd9719bc
+SHA1 (patch-bv) = 26ccbb67d5b592a783101200cceeaff852edd195
 SHA1 (patch-bw) = 2dd00c3b3cebc8dfc926429648a6f9a3d314d041
 SHA1 (patch-bx) = a8e538ec5bf5f0c6bba76a136186430a72e480fa
 SHA1 (patch-by) = bb381baef296a792b01bacacbaa54710736ffd8f
Index: patches/patch-bu
===================================================================
RCS file: /cvsroot/pkgsrc/parallel/pvm3/patches/patch-bu,v
retrieving revision 1.3
diff -u -p -r1.3 patch-bu
--- patches/patch-bu	29 Jan 2011 20:37:35 -0000	1.3
+++ patches/patch-bu	26 Jun 2022 22:49:56 -0000
@@ -2,14 +2,26 @@ $NetBSD: patch-bu,v 1.3 2011/01/29 20:37
 
 --- examples/Makefile.aimk.orig	Wed Feb 16 21:49:35 2000
 +++ examples/Makefile.aimk	Thu Mar 25 03:43:25 2004
-@@ -85,5 +85,5 @@
+@@ -63,7 +63,7 @@ FFLOPTS		=	-g
+ FFLAGS		=	$(FFLOPTS) $(ARCHFFLAGS)
+ FLIBS		=	-lfpvm3
+ 
+-LDFLAGS		=	$(LOPT) -L$(PVMDIR)/lib/$(PVM_ARCH)
++LDFLAGS		+=	$(LOPT) -L$(PVMDIR)/lib/$(PVM_ARCH)
+ 
+ CPROGS		=	hello$(EXESFX) hello_other$(EXESFX) \
+ 				gexample$(EXESFX) \
+@@ -84,7 +84,7 @@ HOSTFPROGS	=	fmaster1h hitch
+ CTXPROGS	=	inherita$(EXESFX) inheritb$(EXESFX) inherit1$(EXESFX) \
  				inherit2$(EXESFX) inherit3$(EXESFX)
  
 -MBPROGS		=	taskf.o task0$(EXESFX) task1$(EXESFX) \
 +MBPROGS		=	taskf.lo task0$(EXESFX) task1$(EXESFX) \
  				task_end$(EXESFX) rme$(EXESFX) \
  				lmbi$(EXESFX) gmbi$(EXESFX)
-@@ -108,172 +108,177 @@
+ 
+@@ -107,173 +107,178 @@ $(XDIR):
+ 	- mkdir $(BDIR)
  	- mkdir $(XDIR)
  
 +LTCC=		${LIBTOOL} --mode=compile ${CC}
Index: patches/patch-bv
===================================================================
RCS file: /cvsroot/pkgsrc/parallel/pvm3/patches/patch-bv,v
retrieving revision 1.3
diff -u -p -r1.3 patch-bv
--- patches/patch-bv	29 Jan 2011 20:37:35 -0000	1.3
+++ patches/patch-bv	26 Jun 2022 22:49:56 -0000
@@ -2,13 +2,14 @@ $NetBSD: patch-bv,v 1.3 2011/01/29 20:37
 
 --- gexamples/Makefile.aimk.orig	Wed Feb 16 21:48:37 2000
 +++ gexamples/Makefile.aimk	Thu Mar 25 02:04:18 2004
-@@ -38,48 +38,53 @@
+@@ -37,50 +37,55 @@ PROGS	=	joinleave$(EXESFX) gexamp$(EXESF
+ 			thb$(EXESFX) tnb$(EXESFX) ge$(EXESFX) tjl$(EXESFX) \
  			tjf$(EXESFX) trsg$(EXESFX) frsg$(EXESFX) gs$(EXESFX)
  
 +LTCC=		${LIBTOOL} --mode=compile ${CC}
 +LTCC_LINK=	${LIBTOOL} --mode=link ${CC} ${PVM_STATIC} ${COMPILER_RPATH_FLAG}${PVM_DIR}/lib/${PVM_ARCH}
 +LTFORT=		${LIBTOOL} --mode=compile --tag=F77 ${FC}
-+LTFORT_LINK=	${LIBTOOL} --mode=link --tag=F77 ${FC} ${PVM_STATIC} ${COMPILER_RPATH_FLAG}${PVM_DIR}/lib/${PVM_ARCH}
++LTFORT_LINK=	${LIBTOOL} --mode=link --tag=F77 ${FC} ${PVM_STATIC} ${COMPILER_RPATH_FLAG}${PVM_DIR}/lib/${PVM_ARCH} ${LDFLAGS}
 +
  all:  $(PROGS)
  
@@ -67,3 +68,4 @@ $NetBSD: patch-bv,v 1.3 2011/01/29 20:37
 +	$(LTFORT_LINK) $(FFLAGS) -o $@ $(SDIR)/frsg.f $(PVMFLIB)
  	cp frsg$(EXESFX) $(XDIR)
  
+ clean: