math/R Makeconf fix

[Brook Milligan <brook%nmsu.edu@localhost>]

> On Dec 16, 2024, at 03:10, Jonathan Perkin <jperkin%mnx.io@localhost> wrote:
> 
> The tree is now frozen in preparation for 2024Q4.  The 'gdt' rules as
> per:
> 
>  https://nam10.safelinks.protection.outlook.com/?url=https%3A%2F%2Fwww.pkgsrc.org%2Fquarterly%2F&data=05%7C02%7Cbrook%40biology.nmsu.edu%7C69c74838ba25432730fd08dd1db9e0f1%7Ca3ec87a89fb84158ba8ff11bace1ebaa%7C1%7C0%7C638699406451824367%7CUnknown%7CTWFpbGZsb3d8eyJFbXB0eU1hcGkiOnRydWUsIlYiOiIwLjAuMDAwMCIsIlAiOiJXaW4zMiIsIkFOIjoiTWFpbCIsIldUIjoyfQ%3D%3D%7C80000%7C%7C%7C&sdata=9YDI5MIFSe4O%2FV7N9uJafYPKdyp7Ln%2FJ5adWu%2Fh8u9U%3D&reserved=0
> 
> are now in effect.  Please be extra extra careful about any changes that
> are made, and make sure they are pkglint clean.

I would like to commit the following patch to fix a bug in Makeconf.in for the math/R package.

Makeconf (made from Makeconf.in) is a Makefile fragment that R uses to build packages or other software from within R.  Currently, it passes rpath directories to the linker using -Wl,-R.  This fails on Darwin and should be replaced by -Wl,-rpath.  While at it, the patch also uses the same argument to -rpath as used to -L.

This should not affect building R itself or R packages within pkgsrc.

Please confirm that this is OK during the freeze.

Thanks a lot.

Cheers,
Brook

Index: patches/patch-configure.ac
===================================================================
RCS file: /cvsroot/pkgsrc/math/R/patches/patch-configure.ac,v
retrieving revision 1.9
diff -u -r1.9 patch-configure.ac
--- patches/patch-configure.ac	27 May 2024 20:45:14 -0000	1.9
+++ patches/patch-configure.ac	16 Dec 2024 18:33:22 -0000
@@ -3,8 +3,8 @@
 Do not include system paths in R_LD_LIBRARY_PATH.
 NetBSD, FreeBSD, DragonFly, Darwin and Solaris fixes
 
---- configure.ac.orig	2024-03-27 08:02:03.000000000 +0900
-+++ configure.ac	2024-04-29 00:00:51.788804133 +0900
+--- configure.ac.orig	2024-03-26 23:02:03.000000000 +0000
++++ configure.ac
 @@ -33,6 +33,7 @@ m4_define([R_VERSION],
  AC_INIT([R],[R_VERSION],[https://bugs.r-project.org],[R],[https://www.r-project.org])
  AC_CONFIG_SRCDIR([src/include/Defn.h])
@@ -27,7 +27,7 @@
  ## As from R 3.2.0 split up -L... and -lR
  if test "${want_R_shlib}" = yes; then
 -  LIBR0="-L\"\$(R_HOME)/lib\$(R_ARCH)\""
-+  LIBR0="-Wl,-R${prefix}/lib/R/lib\$(R_ARCH) -L\"\$(R_HOME)/lib\$(R_ARCH)\""
++  LIBR0="-Wl,-rpath,\"\$(R_HOME)/lib\$(R_ARCH)\" -L\"\$(R_HOME)/lib\$(R_ARCH)\""
    LIBR1=-lR
  else
    LIBR0=