Skip to content

Commit

Permalink
ARROW-9574: [R] Cleanups for CRAN 1.0.0 release
Browse files Browse the repository at this point in the history
Closes apache#7832 from nealrichardson/r-post-1.0.0

Authored-by: Neal Richardson <[email protected]>
Signed-off-by: Neal Richardson <[email protected]>
  • Loading branch information
nealrichardson committed Jul 27, 2020
1 parent a967d84 commit 4fd929b
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 12 deletions.
2 changes: 1 addition & 1 deletion r/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ brew install apache-arrow --HEAD
```

On Windows, you can download a .zip file with the arrow dependencies from the
[nightly bintray repository](https://dl.bintray.com/ursalabs/arrow-r/libarrow/bin/windows-35/),
[nightly bintray repository](https://dl.bintray.com/ursalabs/arrow-r/libarrow/bin/windows/),
and then set the `RWINLIB_LOCAL` environment variable to point to that
zip file before installing the `arrow` R package. Version numbers in that
repository correspond to dates, and you will likely want the most recent.
Expand Down
21 changes: 11 additions & 10 deletions r/configure
Original file line number Diff line number Diff line change
Expand Up @@ -198,16 +198,17 @@ fi
# Write to Makevars
sed -e "s|@cflags@|$PKG_CFLAGS|" -e "s|@libs@|$PKG_LIBS|" src/Makevars.in > src/Makevars

# Add stripping
if [ "$R_STRIP_SHARED_LIB" != "" ]; then
# R_STRIP_SHARED_LIB is set in the global Renviron and should be available here
echo "
strip: \$(SHLIB)
$R_STRIP_SHARED_LIB \$(SHLIB) >/dev/null 2>&1 || true
.phony: strip
" >> src/Makevars
fi
# This is removed because a (bad?) CRAN check fails when arrow.so is stripped
# # Add stripping
# if [ "$R_STRIP_SHARED_LIB" != "" ]; then
# # R_STRIP_SHARED_LIB is set in the global Renviron and should be available here
# echo "
# strip: \$(SHLIB)
# $R_STRIP_SHARED_LIB \$(SHLIB) >/dev/null 2>&1 || true
#
# .phony: strip
# " >> src/Makevars
# fi

# Success
exit 0
2 changes: 1 addition & 1 deletion r/cran-comments.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Fedora Linux, GCC/clang, R-devel
* Ubuntu Linux 16.04 LTS, R-release, GCC
* win-builder (R-devel and R-release)
* macOS 10.14, R-release
* macOS 10.14, R-oldrel

## R CMD check results

Expand Down

0 comments on commit 4fd929b

Please sign in to comment.