Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .azure-pipelines/azure-pipelines-linux.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .azure-pipelines/azure-pipelines-osx.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .azure-pipelines/azure-pipelines-win.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 0 additions & 8 deletions .ci_support/migrations/icu75.yaml

This file was deleted.

8 changes: 4 additions & 4 deletions .ci_support/osx_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ bzip2:
c_compiler:
- clang
c_compiler_version:
- '18'
- '19'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
Expand All @@ -21,15 +21,15 @@ channel_targets:
cxx_compiler:
- clangxx
cxx_compiler_version:
- '18'
- '19'
expat:
- '2'
fontconfig:
- '2'
fortran_compiler:
- gfortran
fortran_compiler_version:
- '13'
- '14'
glib:
- '2'
gsl:
Expand All @@ -55,7 +55,7 @@ libpng:
libtiff:
- '4.7'
llvm_openmp:
- '18'
- '19'
macos_machine:
- x86_64-apple-darwin13.4.0
pango:
Expand Down
8 changes: 4 additions & 4 deletions .ci_support/osx_arm64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ bzip2:
c_compiler:
- clang
c_compiler_version:
- '18'
- '19'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
Expand All @@ -21,15 +21,15 @@ channel_targets:
cxx_compiler:
- clangxx
cxx_compiler_version:
- '18'
- '19'
expat:
- '2'
fontconfig:
- '2'
fortran_compiler:
- gfortran
fortran_compiler_version:
- '13'
- '14'
glib:
- '2'
gsl:
Expand All @@ -55,7 +55,7 @@ libpng:
libtiff:
- '4.7'
llvm_openmp:
- '18'
- '19'
macos_machine:
- arm64-apple-darwin20.0.0
pango:
Expand Down
1 change: 1 addition & 0 deletions .gitattributes

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .scripts/build_steps.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 1 addition & 4 deletions .scripts/create_conda_build_artifacts.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .scripts/create_conda_build_artifacts.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .scripts/run_docker_build.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .scripts/run_osx_build.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .scripts/run_win_build.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

43 changes: 0 additions & 43 deletions recipe/0019-Copy-dz-gemmtr.f-from-lapack-to-Rblas.patch

This file was deleted.

9 changes: 6 additions & 3 deletions recipe/build-r-base.sh
Original file line number Diff line number Diff line change
Expand Up @@ -305,9 +305,6 @@ Mingw_w64_makefiles() {
echo "LEA_MALLOC = YES" > "${SRC_DIR}/src/gnuwin32/MkRules.local"
echo "BINPREF = ${HOST}-" >> "${SRC_DIR}/src/gnuwin32/MkRules.local"
echo "BINPREF64 = ${HOST}-" >> "${SRC_DIR}/src/gnuwin32/MkRules.local"
echo "USE_ATLAS = YES" >> "${SRC_DIR}/src/gnuwin32/MkRules.local"
echo "ATLAS_PATH = ${PREFIX}/Library/lib" >> "${SRC_DIR}/src/gnuwin32/MkRules.local"
sed -i.bak 's|-lf77blas -latlas|-llapack -lblas|g' src/extra/blas/Makefile.win
echo "MULTI = " >> "${SRC_DIR}/src/gnuwin32/MkRules.local"
# BUILD_HTML causes filenames with special characters to be created, see
# https://github.com/conda-forge/r-base-feedstock/pull/177#issuecomment-845279175
Expand Down Expand Up @@ -390,6 +387,12 @@ Mingw_w64_makefiles() {

rm -rf ${PREFIX}/lib/R/share/zoneinfo

rm -rf ${PREFIX}/lib/R/bin/${R_ARCH}/Rblas.dll
rm -rf ${PREFIX}/lib/R/bin/${R_ARCH}/Rlapack.dll

create-forwarder-dll ${PREFIX_WIN}\\Library\\bin\\libblas.dll ${PREFIX_WIN}\\lib\\R\\bin\\${R_ARCH}\\Rblas.dll --no-temp-dir
create-forwarder-dll ${PREFIX_WIN}\\Library\\bin\\liblapack.dll ${PREFIX_WIN}\\lib\\R\\bin\\${R_ARCH}\\Rlapack.dll --no-temp-dir

return 0
}

Expand Down
4 changes: 2 additions & 2 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,9 @@ source:
- 0014-Use-conda-s-tzdata-package.patch
- 0015-Win32-Fix-COMPILED_BY-for-custom-GCC-pkgversion.patch
- 0018-Fix-path-to-TCL-TK.patch
- 0019-Copy-dz-gemmtr.f-from-lapack-to-Rblas.patch # [win]

build:
number: 0
number: 1
no_link:
- lib/R/doc/html/packages.html

Expand Down Expand Up @@ -91,6 +90,7 @@ outputs:
- autoconf >=2.72 # [unix]
- m2-autoconf2.72 # [win] 2.71
- m2-automake-wrapper # [win]
- create-forwarder-dll # [win]
- automake # [not win]
- make # [not win]
# shellcheck is used to check activation scripts; it is not yet built for linux-ppc64le.
Expand Down
Loading