(math/R) pick the changes on patches/patch-configure.ac (2025/01/18 by brook)

[Makoto Fujiwara (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Makoto Fujiwara <makoto%if.t.u-tokyo.ac.jp@localhost>
Pushed By:	mef
Date:		Sat Jan 3 17:35:05 2026 +0900
Changeset:	e48890f6c4cb0533d091449395ea9e249311a0fd

Modified Files:
	R/distinfo
	R/patches/patch-configure.ac

Log Message:
(math/R) pick the changes on patches/patch-configure.ac  (2025/01/18 by brook)

----------------------------
revision 1.10
date: 2025-01-18 07:12:09 +0900;  author: brook;  state: Exp;  lines: +4 -4;  commitid: QwOyqo5qFRiL7TFF;
math/R: fix rpath flag in Makeconf

The R package installs a Makefile fragment, Makeconf, which includes
all the variable definitions required for R packages to compile
external programs.  The variable LIBR0, defined by the configure
script, is inserted into Makeconf and contains the linker directory
search and rpath arguments.  However, this variable passes the rpath
directory to the linker with -Wl,-R, which fails on Darwin.  Instead,
use ${COMPILER_RPATH_FLAG}, which is set correctly for each platform.

While here, make the paths for -rpath and -L the same.
----------------------------

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=e48890f6c4cb0533d091449395ea9e249311a0fd

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

diffstat:
 R/distinfo                   |  2 +-
 R/patches/patch-configure.ac | 13 +++++++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diffs:
diff --git a/R/distinfo b/R/distinfo
index 54d248cc7c..9b4a87546b 100644
--- a/R/distinfo
+++ b/R/distinfo
@@ -3,7 +3,7 @@ $NetBSD: distinfo,v 1.111 2025/03/02 10:26:38 mef Exp $
 BLAKE2s (R-4.4.3.tar.gz) = c7860018ef691608dfa505c2bbeb7e015d03d106e8590587b49d1eac63449cda
 SHA512 (R-4.4.3.tar.gz) = 2a1d1e5ee2e18c928e2b3e58df372083b4bbd0822863a8441404999209035436e236c8ffe3970827fbf3d765157365800ebb0bb46f361c6abe473ddec30be06f
 Size (R-4.4.3.tar.gz) = 40234425 bytes
-SHA1 (patch-configure.ac) = 41bb6ab2034cbd39c93bbf733097fab21328ba0b
+SHA1 (patch-configure.ac) = 61904b7918019204634d61bce2421c01c81ed640
 SHA1 (patch-m4_R.m4) = 3e1d390d8aa9895aee7cb479ddab371d82562b88
 SHA1 (patch-src_extra_xdr_xdr__mem.c) = 2e607b070db8b24a6ad5501e9c7c1549bf1b1d82
 SHA1 (patch-src_extra_xdr_xdr__stdio.c) = e4d8ace08ad282f44113941dd6a3b194769b8167
diff --git a/R/patches/patch-configure.ac b/R/patches/patch-configure.ac
index fb74147eae..2de1d5348c 100644
--- a/R/patches/patch-configure.ac
+++ b/R/patches/patch-configure.ac
@@ -20,8 +20,8 @@ release    line #
 10.99.12   4770   withval=$with_blas; if test "${withval}" = no; then
  9.3       4392   withval=$with_blas; R_ARG_USE(blas)
 
---- configure.ac	2026-01-02 17:46:48.409027336 +0900
-+++ configure.ac	2026-01-02 17:46:48.409027336 +0900
+--- configure.ac	2026-01-03 17:00:22.984847292 +0900
++++ configure.ac	2026-01-03 17:00:22.984847292 +0900
 @@ -33,6 +33,7 @@
  AC_INIT([R],[R_VERSION],[https://bugs.r-project.org],[R],[https://www.r-project.org])
  AC_CONFIG_SRCDIR([src/include/Defn.h])
@@ -30,3 +30,12 @@ release    line #
  
  ### * Information on the package.
  
+@@ -317,6 +318,8 @@
+ ## 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="${COMPILER_RPATH_FLAG}\"\$(R_HOME)/lib\$(R_ARCH)\" -L\"\$(R_HOME)/lib\$(R_ARCH)\""                                                                        |
+   LIBR1=-lR
+ else
+   LIBR0=