CVS commit: pkgsrc/math/R

["Brook Milligan" <brook%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   brook
Date:           Fri Jan 17 22:12:09 UTC 2025

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

Log Message:
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 generate a diff of this commit:
cvs rdiff -u -r1.108 -r1.109 pkgsrc/math/R/distinfo
cvs rdiff -u -r1.9 -r1.10 pkgsrc/math/R/patches/patch-configure.ac

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

Modified files:

Index: pkgsrc/math/R/distinfo
diff -u pkgsrc/math/R/distinfo:1.108 pkgsrc/math/R/distinfo:1.109
--- pkgsrc/math/R/distinfo:1.108        Fri Nov  1 07:12:59 2024
+++ pkgsrc/math/R/distinfo      Fri Jan 17 22:12:09 2025
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.108 2024/11/01 07:12:59 mef Exp $
+$NetBSD: distinfo,v 1.109 2025/01/17 22:12:09 brook Exp $
 
 BLAKE2s (R-4.4.2.tar.gz) = eb8c3d41ba6d0e12401f03410d2c8bb37dc3344989824c990f9a33f08ebb6c5c
 SHA512 (R-4.4.2.tar.gz) = b29d82242f70487f52849a5726610c03dffa4e54f1a32a9f3f76784fcf61f91d5c40cddee1029eeb9c9837ff26f382f348e8518dd68c84e9fc2192b981013d9a
 Size (R-4.4.2.tar.gz) = 37582785 bytes
-SHA1 (patch-configure.ac) = 91bed37afc2ee2f68695f8496c56ae23aaf42b43
+SHA1 (patch-configure.ac) = 7a62031864a9cef7b40278a7579293469fba7446
 SHA1 (patch-m4_R.m4) = 3e1d390d8aa9895aee7cb479ddab371d82562b88
 SHA1 (patch-src_include_R__ext_Error.h) = bc55a8bba6bf931e3f6794577e63bfafdfc740cf
 SHA1 (patch-src_library_stats_src_Makefile.in) = 4eb93292858392792c37a706399e2cef91821bbe

Index: pkgsrc/math/R/patches/patch-configure.ac
diff -u pkgsrc/math/R/patches/patch-configure.ac:1.9 pkgsrc/math/R/patches/patch-configure.ac:1.10
--- pkgsrc/math/R/patches/patch-configure.ac:1.9        Mon May 27 20:45:14 2024
+++ pkgsrc/math/R/patches/patch-configure.ac    Fri Jan 17 22:12:09 2025
@@ -1,10 +1,10 @@
-$NetBSD: patch-configure.ac,v 1.9 2024/05/27 20:45:14 mef Exp $
+$NetBSD: patch-configure.ac,v 1.10 2025/01/17 22:12:09 brook Exp $
 
 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 @@ NetBSD, FreeBSD, DragonFly, Darwin and S
  ## 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=