CVS commit: pkgsrc/devel/R-Rcpp

["Makoto Fujiwara" <mef%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   mef
Date:           Fri Jun  5 23:49:28 UTC 2026

Modified Files:
        pkgsrc/devel/R-Rcpp: Makefile distinfo
        pkgsrc/devel/R-Rcpp/patches: patch-src_Makevars

Log Message:
(devel/R-Rpp) Trying to fix build either on *BSD and SmartOS by SUBST

Tested on NetBSD/amd64 11.99.6 and SmartOS
   SunOS smaortOS 5.11 joyent_20260528T000227Z i86pc i386 i86pc

To my knowledge, neither (ifneq and endif) nor (if .endif) clause in src/Makevars does
work, sorry, so SUBST frame work are used for now, please improve this changes,
thanks


To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 pkgsrc/devel/R-Rcpp/Makefile
cvs rdiff -u -r1.31 -r1.32 pkgsrc/devel/R-Rcpp/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/R-Rcpp/patches/patch-src_Makevars

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

Modified files:

Index: pkgsrc/devel/R-Rcpp/Makefile
diff -u pkgsrc/devel/R-Rcpp/Makefile:1.36 pkgsrc/devel/R-Rcpp/Makefile:1.37
--- pkgsrc/devel/R-Rcpp/Makefile:1.36   Thu May 21 09:11:08 2026
+++ pkgsrc/devel/R-Rcpp/Makefile        Fri Jun  5 23:49:27 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2026/05/21 09:11:08 mef Exp $
+# $NetBSD: Makefile,v 1.37 2026/06/05 23:49:27 mef Exp $
 
 R_PKGNAME=     Rcpp
 R_PKGVER=      1.1.1-1.1
@@ -52,5 +52,17 @@ REPLACE_FILES.Rscript=       ${REPLACE_RSCRIPT
 CHECK_SSP_SKIP+=       lib/R/library/Rcpp/*/bin/*/*.deb
 CHECK_RELRO_SKIP+=     ${CHECK_SSP_SKIP}
 
+.include "../../mk/bsd.prefs.mk"
+SUBST_CLASSES+=                pkglibs
+SUBST_STAGE.pkglibs=   pre-configure
+SUBST_FILES.pkglibs=   src/Makevars
+.if ${OPSYS} != SunOS
+SUBST_SED.pkglibs=     -e s,@@PKGLIBS@@,PKG_LIBS+=-lexecinfo,
+.else
+SUBST_SED.pkglibs=     -e s,@@PKGLIBS@@,,
+.endif
+SUBST_MESSAGE.pkglibs= Add -lexecinfo for *BSD
+
+
 .include "../../math/R/Makefile.extension"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/R-Rcpp/distinfo
diff -u pkgsrc/devel/R-Rcpp/distinfo:1.31 pkgsrc/devel/R-Rcpp/distinfo:1.32
--- pkgsrc/devel/R-Rcpp/distinfo:1.31   Tue Jun  2 14:26:19 2026
+++ pkgsrc/devel/R-Rcpp/distinfo        Fri Jun  5 23:49:27 2026
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.31 2026/06/02 14:26:19 mef Exp $
+$NetBSD: distinfo,v 1.32 2026/06/05 23:49:27 mef Exp $
 
 BLAKE2s (R/Rcpp_1.1.1-1.1.tar.gz) = 76ad2a8553456a12d7e05f77d8b258c983699bea68bf6ba39f0ad46159c3f125
 SHA512 (R/Rcpp_1.1.1-1.1.tar.gz) = 11f3d6936d7a1fdd053e0820bf4973b560450b49f74d4f9c9257e0298bf7eb9bfb02c886816a24877fe292b34f5fd1016d50e9582d5205d4ea4b1876a5d71cd4
 Size (R/Rcpp_1.1.1-1.1.tar.gz) = 1883279 bytes
 SHA1 (patch-inst_include_Rcpp_utils_tinyformat.h) = 8927fe1ff226ceae6732c115c6e4c6a5cedd26ef
-SHA1 (patch-src_Makevars) = 3ef136a7b55eadcdd179fa960b38e5aadd66f832
+SHA1 (patch-src_Makevars) = 481658d03dbe5ffaf21967d0e4990cdf4933feb5

Index: pkgsrc/devel/R-Rcpp/patches/patch-src_Makevars
diff -u pkgsrc/devel/R-Rcpp/patches/patch-src_Makevars:1.2 pkgsrc/devel/R-Rcpp/patches/patch-src_Makevars:1.3
--- pkgsrc/devel/R-Rcpp/patches/patch-src_Makevars:1.2  Tue Jun  2 14:26:19 2026
+++ pkgsrc/devel/R-Rcpp/patches/patch-src_Makevars      Fri Jun  5 23:49:28 2026
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_Makevars,v 1.2 2026/06/02 14:26:19 mef Exp $
+$NetBSD: patch-src_Makevars,v 1.3 2026/06/05 23:49:28 mef Exp $
 
 Rcpp needs the function backtrace_symbols which may be found at
 /usr/lib/libexecinfo.* ( in *BSD OS, I assume) as shown below,
@@ -14,14 +14,11 @@ ERROR: loading failed
 ---------------------------------------
 But because of R building system, LIBS+= -lexecinfo does not work,
 so the patch
+(Please also see SUBST_STAGE+= pkglib line in Makefile)
 
 --- src/Makevars.orig  2023-02-07 11:10:15.000000000 +0900
 +++ src/Makevars       2026-05-21 17:17:44.950656859 +0900
-@@ -1,2 +1,7 @@
-+UNAME := $(shell uname) 
-+
+@@ -1,2 +1,3 @@
  PKG_CPPFLAGS =        -I../inst/include/
  
-+.if $(UNAME) != "Linux"
-+PKG_LIBS = -lexecinfo
-+.endif
++@@PKGLIBS@@