Mon Jan 8 23:13:03 2024 UTC (140d)
(math/R) correction on patch-configure.ac.again


(mef)
diff -r1.100 -r1.101 pkgsrc/math/R/distinfo
diff -r1.7 -r1.8 pkgsrc/math/R/patches/patch-configure.ac
cvs diff -r1.100 -r1.101 pkgsrc/math/R/distinfo (expand / switch to unified diff)

--- pkgsrc/math/R/distinfo 2024/01/08 23:03:50 1.100
+++ pkgsrc/math/R/distinfo 2024/01/08 23:13:02 1.101
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1$NetBSD: distinfo,v 1.100 2024/01/08 23:03:50 mef Exp $ 1$NetBSD: distinfo,v 1.101 2024/01/08 23:13:02 mef Exp $
2 2
3BLAKE2s (R-4.3.2.tar.gz) = a79080d65222ec6698175c037390e666385567b1e123acf6ce1e33ee3f122005 3BLAKE2s (R-4.3.2.tar.gz) = a79080d65222ec6698175c037390e666385567b1e123acf6ce1e33ee3f122005
4SHA512 (R-4.3.2.tar.gz) = 125114357f20d4a3248aee86727768d1dc15e07e44353f8a68fe2ef1fedae508e85d944301d00c0edd61e8b012b0b3cdcde53ac60be903713f96542d83ad5b1d 4SHA512 (R-4.3.2.tar.gz) = 125114357f20d4a3248aee86727768d1dc15e07e44353f8a68fe2ef1fedae508e85d944301d00c0edd61e8b012b0b3cdcde53ac60be903713f96542d83ad5b1d
5Size (R-4.3.2.tar.gz) = 35039225 bytes 5Size (R-4.3.2.tar.gz) = 35039225 bytes
6SHA1 (patch-configure.ac) = ba01daf66dd48005e3cfe604a24ad2339ac164d3 6SHA1 (patch-configure.ac) = 3cd063c424b7b9674f434d49c771b76dde73ac5c
7SHA1 (patch-m4_R.m4) = 4d6eb8f2fae83cf36583d553bb5f4cc42296746c 7SHA1 (patch-m4_R.m4) = 4d6eb8f2fae83cf36583d553bb5f4cc42296746c
8SHA1 (patch-src_library_stats_src_Makefile.in) = 4eb93292858392792c37a706399e2cef91821bbe 8SHA1 (patch-src_library_stats_src_Makefile.in) = 4eb93292858392792c37a706399e2cef91821bbe
cvs diff -r1.7 -r1.8 pkgsrc/math/R/patches/patch-configure.ac (expand / switch to unified diff)

--- pkgsrc/math/R/patches/patch-configure.ac 2024/01/08 23:03:50 1.7
+++ pkgsrc/math/R/patches/patch-configure.ac 2024/01/08 23:13:03 1.8
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-configure.ac,v 1.7 2024/01/08 23:03:50 mef Exp $ 1$NetBSD: patch-configure.ac,v 1.8 2024/01/08 23:13:03 mef Exp $
2 2
3Do not include system paths in R_LD_LIBRARY_PATH. 3Do not include system paths in R_LD_LIBRARY_PATH.
4NetBSD, FreeBSD, DragonFly, Darwin and Solaris fixes 4NetBSD, FreeBSD, DragonFly, Darwin and Solaris fixes
5 5
6--- configure.ac.orig 2019-06-08 08:57:35.738653089 +0000 6--- configure.ac.orig 2019-06-08 08:57:35.738653089 +0000
7+++ configure.ac 7+++ configure.ac
8@@ -33,6 +33,7 @@ m4_define([R_VERSION], 8@@ -33,6 +33,7 @@ m4_define([R_VERSION],
9 AC_INIT([R],[R_VERSION],[https://bugs.r-project.org],[R],[https://www.r-project.org]) 9 AC_INIT([R],[R_VERSION],[https://bugs.r-project.org],[R],[https://www.r-project.org])
10 AC_CONFIG_SRCDIR([src/include/Defn.h]) 10 AC_CONFIG_SRCDIR([src/include/Defn.h])
11 AC_CONFIG_AUX_DIR([tools]) 11 AC_CONFIG_AUX_DIR([tools])
12+AC_CONFIG_MACRO_DIR([m4]) 12+AC_CONFIG_MACRO_DIR([m4])
13  13
14 ### * Information on the package. 14 ### * Information on the package.
@@ -75,27 +75,27 @@ NetBSD, FreeBSD, DragonFly, Darwin and S @@ -75,27 +75,27 @@ NetBSD, FreeBSD, DragonFly, Darwin and S
75 shlib_cxxldflags="-shared" 75 shlib_cxxldflags="-shared"
76 fi 76 fi
77 else 77 else
78+ shlib_ldflags="-G" 78+ shlib_ldflags="-G"
79+ shlib_cxxldflags="-G" 79+ shlib_cxxldflags="-G"
80 cpicflags="-KPIC" 80 cpicflags="-KPIC"
81 if test "`basename ${CXX}`" = "CC" ; then 81 if test "`basename ${CXX}`" = "CC" ; then
82 ## Forte version 7 needs -lCstd: Forte 6 does not.  82 ## Forte version 7 needs -lCstd: Forte 6 does not.
83@@ -1495,7 +1502,7 @@ fi 83@@ -1495,7 +1502,7 @@ fi
84 : ${CXXPICFLAGS="${cxxpicflags}"} 84 : ${CXXPICFLAGS="${cxxpicflags}"}
85 if test -n "${CXX}" -a -z "${CXXPICFLAGS}"; then 85 if test -n "${CXX}" -a -z "${CXXPICFLAGS}"; then
86 case "${host_os}" in 86 case "${host_os}" in
87- aix*|mingw*|msys) 87- aix*|mingw*|msys)
88+ aix*|mingw*||msys|darwin*) 88+ aix*|mingw*|msys|darwin*)
89 ;; 89 ;;
90 *) 90 *)
91 warn_cxxpicflags="I could not determine CXXPICFLAGS." 91 warn_cxxpicflags="I could not determine CXXPICFLAGS."
92@@ -1555,8 +1562,10 @@ dnl ;; 92@@ -1555,8 +1562,10 @@ dnl ;;
93 MAJR_VERSION=`echo "${PACKAGE_VERSION}" | sed -e "s/[[\.]][[1-9]]$/.0/"`  93 MAJR_VERSION=`echo "${PACKAGE_VERSION}" | sed -e "s/[[\.]][[1-9]]$/.0/"`
94 LIBR_LDFLAGS="-install_name libR.dylib -compatibility_version ${MAJR_VERSION} -current_version ${PACKAGE_VERSION} -headerpad_max_install_names" 94 LIBR_LDFLAGS="-install_name libR.dylib -compatibility_version ${MAJR_VERSION} -current_version ${PACKAGE_VERSION} -headerpad_max_install_names"
95 RLAPACK_LDFLAGS="-install_name libRlapack.dylib -compatibility_version ${MAJR_VERSION} -current_version ${PACKAGE_VERSION} -headerpad_max_install_names" 95 RLAPACK_LDFLAGS="-install_name libRlapack.dylib -compatibility_version ${MAJR_VERSION} -current_version ${PACKAGE_VERSION} -headerpad_max_install_names"
96+ LIBR_LDFLAGS="-install_name ${PREFIX}/lib/R/lib/libR.dylib -compatibility_version ${MAJR_VERSION} -current_version ${PACKAGE_VERSION} -headerpad_max_install_names" 96+ LIBR_LDFLAGS="-install_name ${PREFIX}/lib/R/lib/libR.dylib -compatibility_version ${MAJR_VERSION} -current_version ${PACKAGE_VERSION} -headerpad_max_install_names"
97+ RLAPACK_LDFLAGS="-install_name ${PREFIX}/lib/R/lib/libRlapack.dylib -compatibility_version ${MAJR_VERSION} -current_version ${PACKAGE_VERSION} -headerpad_max_install_names" 97+ RLAPACK_LDFLAGS="-install_name ${PREFIX}/lib/R/lib/libRlapack.dylib -compatibility_version ${MAJR_VERSION} -current_version ${PACKAGE_VERSION} -headerpad_max_install_names"
98 ## don't use version in libRblas so we can replace it with any BLAS implementation 98 ## don't use version in libRblas so we can replace it with any BLAS implementation
99- RBLAS_LDFLAGS="-install_name libRblas.dylib -headerpad_max_install_names" 99- RBLAS_LDFLAGS="-install_name libRblas.dylib -headerpad_max_install_names"
100+ RBLAS_LDFLAGS="-install_name ${PREFIX}/lib/R/lib/libRblas.dylib -headerpad_max_install_names" 100+ RBLAS_LDFLAGS="-install_name ${PREFIX}/lib/R/lib/libRblas.dylib -headerpad_max_install_names"
101 ;; 101 ;;