This is an automated email from the ASF dual-hosted git repository.
kszucs pushed a commit to branch maint-1.0.x
in repository https://gitbox.apache.org/repos/asf/arrow.git
commit 1803b36a752075af9bc91d0c550a4c55c9debb56
Author: Neal Richardson <neal.p.richard...@gmail.com>
AuthorDate: Mon Jul 27 15:51:19 2020 -0700
ARROW-9574: [R] Cleanups for CRAN 1.0.0 release
Closes #7832 from nealrichardson/r-post-1.0.0
Authored-by: Neal Richardson <neal.p.richard...@gmail.com>
Signed-off-by: Neal Richardson <neal.p.richard...@gmail.com>
---
r/README.md | 2 +-
r/configure | 21 +++++++++++----------
r/cran-comments.md | 2 +-
3 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/r/README.md b/r/README.md
index 36032c0..1d56019 100644
--- a/r/README.md
+++ b/r/README.md
@@ -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.
diff --git a/r/configure b/r/configure
index e2c7287..ecaeff7 100755
--- a/r/configure
+++ b/r/configure
@@ -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
diff --git a/r/cran-comments.md b/r/cran-comments.md
index 07a184b..8fb63b8 100644
--- a/r/cran-comments.md
+++ b/r/cran-comments.md
@@ -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
