From 66b24e61b50bbf1025d5e0af0decc5507b913c35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Sat, 29 Jan 2022 18:34:29 +0100 Subject: [PATCH] R-cran-Rcpp: update to 1.0.8. Removing -D__MUSL__, as it is defined by R globally cf. 626e5eb25 --- srcpkgs/R-cran-Rcpp/patches/1.0.5--musl.patch | 28 +++++++++++++++++++ srcpkgs/R-cran-Rcpp/template | 13 +++------ 2 files changed, 32 insertions(+), 9 deletions(-) create mode 100644 srcpkgs/R-cran-Rcpp/patches/1.0.5--musl.patch diff --git a/srcpkgs/R-cran-Rcpp/patches/1.0.5--musl.patch b/srcpkgs/R-cran-Rcpp/patches/1.0.5--musl.patch new file mode 100644 index 0000000000..f6cb9e6872 --- /dev/null +++ b/srcpkgs/R-cran-Rcpp/patches/1.0.5--musl.patch @@ -0,0 +1,28 @@ +From f78a62797de3d02b2ca841e3aa240bab961912cf Mon Sep 17 00:00:00 2001 +From: Piotr Wójcik +Date: Sat, 29 Jan 2022 17:51:20 +0100 +Subject: musl + +Relying on __MUSL__ being defined worked with R-cran build style, +as R template exports it. With other build styles things failed. +Detect glibc instead. +--- + inst/include/Rcpp/exceptions_impl.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/inst/include/Rcpp/exceptions_impl.h b/inst/include/Rcpp/exceptions_impl.h +index 8f45028..74763d9 100644 +--- a/inst/include/Rcpp/exceptions_impl.h ++++ b/inst/include/Rcpp/exceptions_impl.h +@@ -34,7 +34,7 @@ + defined(__HAIKU__) || \ + defined(__ANDROID__) + # define RCPP_DEMANGLER_ENABLED 0 +-# elif defined(__GNUC__) || defined(__clang__) ++# elif defined(__GLIBC__) + # include + # define RCPP_DEMANGLER_ENABLED 1 + # else +-- +2.35.0 + diff --git a/srcpkgs/R-cran-Rcpp/template b/srcpkgs/R-cran-Rcpp/template index e19cd39580..d72e63c521 100644 --- a/srcpkgs/R-cran-Rcpp/template +++ b/srcpkgs/R-cran-Rcpp/template @@ -1,16 +1,11 @@ # Template file for 'R-cran-Rcpp' pkgname=R-cran-Rcpp -version=1.0.5 -revision=2 +version=1.0.8 +revision=1 build_style=R-cran short_desc="Seamless R and C++ Integration" maintainer="Florian Wagner " license="GPL-2.0-or-later" homepage="http://www.rcpp.org/" -checksum=b8462c643bcc6fe3b0e9caee9e0cd76c5f7f0e34ee2e7397f93c4c43885c5c04 - -pre_install() { - case "$XBPS_TARGET_MACHINE" in - *-musl) export PKG_CXXFLAGS+=" -D__MUSL__";; - esac -} +changelog="https://raw.githubusercontent.com/RcppCore/Rcpp/master/ChangeLog" +checksum=879f9296bc045ac4ed464578723bd37fcabbbdaa30aaaf070cf953e329f678ee