From e87cc34efbfb4bbfca3c2caf20da070c1e33e571 Mon Sep 17 00:00:00 2001 From: Arjan van de Ven Date: Fri, 9 Feb 2024 18:12:33 +0000 Subject: [PATCH] R-xfun: Autospec creation for update from version 0.41 to version 0.42 Yihui Xie (32): start the next version deprecate isFALSE() for all users (not limiting to R CMD check) (#75) v could be NULL when the error message doesn't contain the version info I expected the number of revdeps of knitr has exceeded the limit of AWS batch jobs, so check at most 9000 revdeps at a time allow for pkgs = character(0) get_fun() was used earlier vectorize check_old_package() submit all groups of jobs at once, and then wait for them to finish, instead of submitting sequentially add news for #75 add a link to the error message, and delete examples of isFALSE() point out the possibly outdated packages to make it easier for users to know what to do with the deprecation of xfun::isFALSE: https://github.com/yihui/yihui.org/discussions/1470#discussioncomment-7515230 add the `envir` argument to `yaml_load()` add ... argument to yaml_body() add a `merge_comments` argument to `split_source()` no need to `<<-` since broken is in scope no need to use xfun:: inside this package Create FUNDING.yml add a `skip` argument to split_source() so that it's possible to skip the rest of code when the skip token is found make split_lines() work with \r\n, too let the `skip` argument of split_source() take value from a global option store the source line number in split_source() output add a function `record()` to record the results of R code factor out some code from knitr to this package as functions csv_options() and divide_chunk() put record.css at the end to prioritize its rules add a `line_number` argument to split_source() import grDevices for record() on Windows, an empty new plot file is created (and locked) upon opening a device, so we need to clean up plot files before opening the device, otherwise we can't delete the initial empty file a helper function decimal_dot() for https://github.com/rstudio/rmarkdown/issues/2525, which will be fixed in knitr later update license year don't return the engine in the divide_chunk() output (it would be a break change: https://github.com/yihui/knitr/actions/runs/7809970020) suppress warnings from Sys.setlocale('LC_NUMERIC'): https://github.com/rstudio/rmarkdown/issues/2525#issuecomment-1933341127 CRAN release v0.42 --- Makefile | 2 +- R-xfun.spec | 46 ++++++++++++++++++++++++++-------------------- options.conf | 6 +++++- release | 2 +- upstream | 2 +- 5 files changed, 34 insertions(+), 24 deletions(-) diff --git a/Makefile b/Makefile index 09738a3..9440580 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ PKG_NAME := R-xfun -URL = https://cran.r-project.org/src/contrib/xfun_0.41.tar.gz +URL = https://cran.r-project.org/src/contrib/xfun_0.42.tar.gz ARCHIVES = include ../common/Makefile.common diff --git a/R-xfun.spec b/R-xfun.spec index 086e047..1a029d8 100644 --- a/R-xfun.spec +++ b/R-xfun.spec @@ -2,14 +2,14 @@ # This file is auto-generated. DO NOT EDIT # Generated by: autospec.py # Using build pattern: R -# autospec version: v2 -# autospec commit: 250a666 +# autospec version: v4 +# autospec commit: da8b975 # Name : R-xfun -Version : 0.41 -Release : 77 -URL : https://cran.r-project.org/src/contrib/xfun_0.41.tar.gz -Source0 : https://cran.r-project.org/src/contrib/xfun_0.41.tar.gz +Version : 0.42 +Release : 78 +URL : https://cran.r-project.org/src/contrib/xfun_0.42.tar.gz +Source0 : https://cran.r-project.org/src/contrib/xfun_0.42.tar.gz Summary : Supporting Functions for Packages Maintained by 'Yihui Xie' Group : Development/Tools License : MIT @@ -38,10 +38,10 @@ export http_proxy=http://127.0.0.1:9/ export https_proxy=http://127.0.0.1:9/ export no_proxy=localhost,127.0.0.1,0.0.0.0 export LANG=C.UTF-8 -export SOURCE_DATE_EPOCH=1698882566 +export SOURCE_DATE_EPOCH=1707502349 %install -export SOURCE_DATE_EPOCH=1698882566 +export SOURCE_DATE_EPOCH=1707502349 rm -rf %{buildroot} LANG=C.UTF-8 CFLAGS="$CLEAR_INTERMEDIATE_CFLAGS -O3 -flto -fno-semantic-interposition " @@ -52,24 +52,27 @@ AR=gcc-ar RANLIB=gcc-ranlib LDFLAGS="$CLEAR_INTERMEDIATE_LDFLAGS -Wl,-z -Wl,relro" mkdir -p %{buildroot}/usr/lib64/R/library +mkdir -p %{buildroot}-v3/usr/lib64/R/library +mkdir -p %{buildroot}-v4/usr/lib64/R/library +mkdir -p %{buildroot}-va/usr/lib64/R/library mkdir -p ~/.R -mkdir -p ~/.stash echo "CFLAGS = $CFLAGS -march=x86-64-v3 -ftree-vectorize -mno-vzeroupper" > ~/.R/Makevars echo "FFLAGS = $FFLAGS -march=x86-64-v3 -ftree-vectorize -mno-vzeroupper " >> ~/.R/Makevars echo "CXXFLAGS = $CXXFLAGS -march=x86-64-v3 -ftree-vectorize -mno-vzeroupper " >> ~/.R/Makevars -R CMD INSTALL --install-tests --use-LTO --built-timestamp=${SOURCE_DATE_EPOCH} --data-compress=none --compress=none --build -l %{buildroot}/usr/lib64/R/library . -for i in `find %{buildroot}/usr/lib64/R/ -name "*.so"`; do mv $i $i.avx2 ; mv $i.avx2 ~/.stash/; done -echo "CFLAGS = $CFLAGS -march=x86-64-v4 -ftree-vectorize -mno-vzeroupper -mprefer-vector-width=512 " > ~/.R/Makevars -echo "FFLAGS = $FFLAGS -march=x86-64-v4 -ftree-vectorize -mno-vzeroupper -mprefer-vector-width=512 " >> ~/.R/Makevars -echo "CXXFLAGS = $CXXFLAGS -march=x86-64-v4 -ftree-vectorize -mno-vzeroupper -mprefer-vector-width=512 " >> ~/.R/Makevars -R CMD INSTALL --preclean --install-tests --use-LTO --no-test-load --data-compress=none --compress=none --built-timestamp=${SOURCE_DATE_EPOCH} --build -l %{buildroot}/usr/lib64/R/library . -for i in `find %{buildroot}/usr/lib64/R/ -name "*.so"`; do mv $i $i.avx512 ; mv $i.avx512 ~/.stash/; done +R CMD INSTALL --install-tests --use-LTO --built-timestamp=${SOURCE_DATE_EPOCH} --data-compress=none --compress=none --build -l %{buildroot}-v3/usr/lib64/R/library . +echo "CFLAGS = $CFLAGS -march=x86-64-v4 -mprefer-vector-width=512 -ftree-vectorize -mno-vzeroupper " > ~/.R/Makevars +echo "FFLAGS = $FFLAGS -march=x86-64-v4 -mprefer-vector-width=512 -ftree-vectorize -mno-vzeroupper " >> ~/.R/Makevars +echo "CXXFLAGS = $CXXFLAGS -march=x86-64-v4 -mprefer-vector-width=512 -ftree-vectorize -mno-vzeroupper " >> ~/.R/Makevars +R CMD INSTALL --preclean --install-tests --use-LTO --no-test-load --data-compress=none --compress=none --built-timestamp=${SOURCE_DATE_EPOCH} --build -l %{buildroot}-v4/usr/lib64/R/library . +echo "CFLAGS = $CFLAGS -march=x86-64-v3 -mapxf -mavx10.1 -ftree-vectorize -mno-vzeroupper" > ~/.R/Makevars +echo "FFLAGS = $FFLAGS -march=x86-64-v3 -mapxf -mavx10.1 -ftree-vectorize -mno-vzeroupper " >> ~/.R/Makevars +echo "CXXFLAGS = $CXXFLAGS -march=x86-64-v3 -ftree-vectorize -mno-vzeroupper " >> ~/.R/Makevars +R CMD INSTALL --install-tests --use-LTO --built-timestamp=${SOURCE_DATE_EPOCH} --data-compress=none --compress=none --build -l %{buildroot}-va/usr/lib64/R/library . echo "CFLAGS = $CFLAGS -ftree-vectorize " > ~/.R/Makevars echo "FFLAGS = $FFLAGS -ftree-vectorize " >> ~/.R/Makevars echo "CXXFLAGS = $CXXFLAGS -ftree-vectorize " >> ~/.R/Makevars -R CMD INSTALL --preclean --use-LTO --install-tests --data-compress=none --compress=none --built-timestamp=${SOURCE_DATE_EPOCH} --build -l %{buildroot}/usr/lib64/R/library . -cp ~/.stash/* %{buildroot}/usr/lib64/R/library/*/libs/ || : +R CMD INSTALL --preclean --use-LTO --install-tests --data-compress=none --compress=none --built-timestamp=${SOURCE_DATE_EPOCH} --build -l %{buildroot}/usr/lib64/R/library . %{__rm} -rf %{buildroot}%{_datadir}/R/library/R.css %check export LANG=C.UTF-8 @@ -109,6 +112,8 @@ R CMD check --no-manual --no-examples --no-codoc . || : /usr/lib64/R/library/xfun/help/xfun.rdx /usr/lib64/R/library/xfun/html/00Index.html /usr/lib64/R/library/xfun/html/R.css +/usr/lib64/R/library/xfun/resources/record.css +/usr/lib64/R/library/xfun/resources/record.html /usr/lib64/R/library/xfun/scripts/call-fun.R /usr/lib64/R/library/xfun/scripts/child-pids.sh /usr/lib64/R/library/xfun/tests/test-ci.R @@ -121,14 +126,15 @@ R CMD check --no-manual --no-examples --no-codoc . || : /usr/lib64/R/library/xfun/tests/test-cran/test-encoding.R /usr/lib64/R/library/xfun/tests/test-cran/test-io.R /usr/lib64/R/library/xfun/tests/test-cran/test-json.R +/usr/lib64/R/library/xfun/tests/test-cran/test-knitr.R /usr/lib64/R/library/xfun/tests/test-cran/test-markdown.R /usr/lib64/R/library/xfun/tests/test-cran/test-packages.R /usr/lib64/R/library/xfun/tests/test-cran/test-paths.R /usr/lib64/R/library/xfun/tests/test-cran/test-string.R /usr/lib64/R/library/xfun/tests/test-cran/test-utils.R +/usr/lib64/R/library/xfun/tests/test-cran/test-yaml.R %files lib %defattr(-,root,root,-) +/V3/usr/lib64/R/library/xfun/libs/xfun.so /usr/lib64/R/library/xfun/libs/xfun.so -/usr/lib64/R/library/xfun/libs/xfun.so.avx2 -/usr/lib64/R/library/xfun/libs/xfun.so.avx512 diff --git a/options.conf b/options.conf index 5dd0f83..ac5d48c 100644 --- a/options.conf +++ b/options.conf @@ -1,6 +1,6 @@ [package] name = R-xfun -url = https://cran.r-project.org/src/contrib/xfun_0.41.tar.gz +url = https://cran.r-project.org/src/contrib/xfun_0.42.tar.gz archives = giturl = https://github.com/yihui/xfun.git domain = @@ -9,6 +9,8 @@ alias = [autospec] # build 32 bit libraries 32bit = false +# allow windows executables (*.exe, *.dll) to be packaged +allow_exe = false # allow package to build with test failures allow_test_failures = false # unset %build ld_as_needed variable @@ -59,6 +61,8 @@ server = false skip_tests = false # add .so files to the lib package instead of dev so_to_lib = false +# configure build for apx +use_apx = false # configure build for avx2 use_avx2 = true # configure build for avx512 diff --git a/release b/release index 987e7ca..8e14edc 100644 --- a/release +++ b/release @@ -1 +1 @@ -77 +78 diff --git a/upstream b/upstream index a929ee0..40b6343 100644 --- a/upstream +++ b/upstream @@ -1 +1 @@ -4e569d6e8176e11ffc9435e78eb46f8a5136f8b9/xfun_0.41.tar.gz +942586dd45a99848f2806dbb48ab0d8c032b86d9/xfun_0.42.tar.gz