Skip to content

Commit 994da82

Browse files
committed
Drop emews-rinside
1 parent 09fe8ed commit 994da82

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

dev/conda/build-generic.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,10 @@ bash init-settings.sh
8181

8282
SETTINGS_SED=$RECIPE_DIR/settings.sed
8383

84-
if (( ENABLE_R == 1 )) && [[ $PLATFORM != "osx-arm64" ]]
84+
if (( ENABLE_R == 1 ))
8585
then
86+
# For the R-enabled installer, we build/install RInside into our
87+
# Anaconda R installation, and install [de]activate scripts.
8688
echo
8789
echo "build-generic.sh: Checking R ..."
8890
if ! which R

dev/conda/pkgs-R.yaml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,7 @@
11
# pkgs-R.yaml: START
22
COMMENT( Extra packages for R. )m4_dnl
3-
COMMENT( Platform osx-arm64 uses our )m4_dnl
4-
COMMENT( custom-built emews-rinside )m4_dnl
5-
COMMENT( Other platforms simply install r and build RInside )m4_dnl
6-
COMMENT( inside build-generic.sh )m4_dnl
73
COMMENT( Retain indentation )m4_dnl
84
m4_ifelse(getenv(PLATFORM),`osx-arm64',
9-
` - swift-t::emews-rinside',
105
` - r=getenv(R_VERSION)'
116
)
127
# pkgs-R.yaml: STOP

0 commit comments

Comments
 (0)