Skip to content
This repository has been archived by the owner on Sep 29, 2022. It is now read-only.

Commit

Permalink
r-base: Pin icu version to 54.* on non-win
Browse files Browse the repository at this point in the history
I need to build new r-base packages with this change.
  • Loading branch information
mingwandroid committed Jun 29, 2016
1 parent 3798830 commit 601fd5d
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 7 deletions.
11 changes: 6 additions & 5 deletions r-base/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -269,13 +269,14 @@ Mingw_w64_makefiles() {
cd "${SRC_DIR}/src/gnuwin32"
if [[ "${_use_msys2_mingw_w64_tcltk}" == "yes" ]]; then
# rinstaller and crandir would come after manuals (if it worked with MSYS2/mingw-w64-{tcl,tk}, in which case we'd just use make distribution anyway)
echo "***** Build started *****" > make_staged.log
echo "***** R-${PACKAGE_VERSION} Build started *****"
for _stage in all cairodevices recommended vignettes manuals; do
echo "***** Stage started ${_stage} *****" >> make_staged.log
make ${_stage} -j${CPU_COUNT} >> make_staged.log 2>&1
echo "***** R-${PACKAGE_VERSION} Stage started: ${_stage} *****"
make ${_stage} -j${CPU_COUNT}
done
else
make distribution -j${CPU_COUNT} > make_distribution.log 2>&1
echo "***** R-${PACKAGE_VERSION} Stage started: distribution *****"
make distribution -j${CPU_COUNT}
fi
# The flakiness mentioned below can be seen if the values are hacked to:
# supremum error = 0.022 with p-value= 1e-04
Expand All @@ -290,7 +291,7 @@ Mingw_w64_makefiles() {
# make check-all -j1 > make-check.log 2>&1 || make check-all -j1 > make-check.2.log 2>&1 || make check-all -j1 > make-check.3.log 2>&1
cd installer
make imagedir
cp -Rf R-3.3.0 R
cp -Rf R-${PKG_VERSION} R
cp -Rf R "${PREFIX}"/
# Remove the recommeded libraries, we package them separately as-per the other platforms now.
rm -Rf "${PREFIX}"/R/library/{MASS,lattice,Matrix,nlme,survival,boot,cluster,codetools,foreign,KernSmooth,rpart,class,nnet,spatial,mgcv}
Expand Down
7 changes: 5 additions & 2 deletions r-base/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ source:
- 0010-configure-Fix-typo-CPPLAGS.patch

build:
number: 1
rpaths:
- lib/R/lib/
- lib/
Expand Down Expand Up @@ -52,7 +53,8 @@ requirements:
- {{pfx}}libsndfile # [win]
- {{pfx}}bwidget # [win]
- {{pfx}}tktable # [win]
- {{pfx}}icu
- {{pfx}}icu 54.* # [not win]
- {{pfx}}icu # [win]
- {{pfx}}tk
- {{pfx}}zlib
- {{pfx}}gsl
Expand Down Expand Up @@ -81,7 +83,8 @@ requirements:
- {{pfx}}libsndfile # [win]
- {{pfx}}bwidget # [win]
- {{pfx}}tktable # [win]
- {{pfx}}icu
- {{pfx}}icu 54.* # [not win]
- {{pfx}}icu # [win]
- {{pfx}}tk
- {{pfx}}zlib
- {{pfx}}gsl
Expand Down

0 comments on commit 601fd5d

Please sign in to comment.