conda-forge / r-base-feedstock

A conda-smithy repository for r-base.
BSD 3-Clause "New" or "Revised" License
14 stars 47 forks source link

Fix build to remove rtools parts #326

Closed isuruf closed 5 months ago

isuruf commented 5 months ago

Checklist

conda-forge-webservices[bot] commented 5 months ago

Hi! This is the friendly automated conda-forge-linting service.

I just wanted to let you know that I linted all conda-recipes in your PR (recipe) and found it was in an excellent condition.

github-actions[bot] commented 5 months ago

Hi! This is the friendly conda-forge automerge bot!

I considered the following status checks when analyzing this PR:

Thus the PR was passing and merged! Have a great day!

github-actions[bot] commented 5 months ago

Hi! This is the friendly conda-forge automerge bot!

Commits were made to this PR after the automerge label was added. For security reasons, I have disabled automerge by removing the automerge label. Please add the automerge label again (or ask a maintainer to do so) if you'd like to enable automerge again!

mbargull commented 5 months ago

Thanks for having dug into this. diff excerpt:

diff -ru0 r-base-4.4.1-hc390f20_9/lib/R/etc/Rcmd_environ r-base-4.4.1-hc390f20_10/lib/R/etc/Rcmd_environ
-R_RTOOLS44_PATH="${RTOOLS44_HOME:-c:/rtools44}/x86_64-w64-mingw32.static.posix/bin;${RTOOLS44_HOME:-c:/rtools44}/usr/bin"
+# INSTALLER-BUILD-x86_64:R_RTOOLS44_PATH="${RTOOLS44_HOME:-c:/rtools44}/x86_64-w64-mingw32.static.posix/bin;${RTOOLS44_HOME:-c:/rtools44}/usr/bin"
-PATH="${R_CUSTOM_TOOLS_PATH:-${R_RTOOLS44_PATH}};${PATH}/"
+# INSTALLER-BUILD:PATH="${R_CUSTOM_TOOLS_PATH:-${R_RTOOLS44_PATH}};${PATH}/"
diff -ru0 r-base-4.4.1-hc390f20_9/lib/R/etc/x64/Makeconf r-base-4.4.1-hc390f20_10/lib/R/etc/x64/Makeconf
-LOCAL_SOFT ?= D:/bld/r-base-split_1719815341864/_h_env/Library
+LOCAL_SOFT ?= D:/bld/r-base-split_1719893459885/_h_env/Library
- R_INSTALLER_BUILD = no
+# INSTALLER-BUILD: R_INSTALLER_BUILD = yes
-     RTOOLS44_HOME ?= c:/rtools44
-     LOCAL_SOFT = $(subst \,/,$(RTOOLS44_HOME))/x86_64-w64-mingw32.static.posix
+    # INSTALLER-BUILD-x86_64: RTOOLS44_HOME ?= c:/rtools44
+    # INSTALLER-BUILD-x86_64: LOCAL_SOFT = $(subst \,/,$(RTOOLS44_HOME))/x86_64-w64-mingw32.static.posix
diff -ru0 r-base-4.4.1-hc390f20_9/lib/R/library/base/R/Rprofile r-base-4.4.1-hc390f20_10/lib/R/library/base/R/Rprofile
-     setRtools44Path <- 1
+    # INSTALLER-BUILD: setRtools44Path <- 1

looking over the source, I can't really make out if this patch suffices, but I restarted the r-matrix build just to see.

mbargull commented 5 months ago

Okay, I misread parts of the code; removing the PATH= etc. makes sense. Backporting to 4.3 also makes sense -- but do you know why the builds for r-matrix did not fail for 4.3 even without that change?

isuruf commented 5 months ago

Probably because c:/rtools44 was in Azure and c:/rtools43 was not

mbargull commented 5 months ago

Ah! Man, it's so much simpler when we can more tightly control the build env (chroot/container-based). ty