Try to please CRAN

r-rust · Oct 1, 2018 · d8355be · d8355be
1 parent 90ab23b
commit d8355be
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: gifski
 Type: Package
 Title: Highest Quality GIF Encoder
-Version: 0.8.6
+Version: 0.8.6.1
 Authors@R: c(
     person("Jeroen", "Ooms", ,"[email protected]", role = c("aut", "cre"),
       comment = c(ORCID = "0000-0002-4035-0289")),

diff --git a/configure b/configure
@@ -8,6 +8,11 @@ if [ $? -eq 0 ]; then
   VERSION=$($CARGO --version)
   echo "Using $CARGO ($VERSION)"
   sed -e "s|@cargobin@|$CARGO|" src/Makevars.in > src/Makevars
+
+  # CRAN forbids using $HOME during CMD check; try to override cargo
+  if [ "$CARGO" == "/usr/bin/cargo" ] && [ -z "CARGO_HOME" ] && [ "$_R_CHECK_SIZE_OF_TARBALL_" ]; then
+    sed -i.bak "s|#export|export|" src/Makevars
+  fi
   exit 0
 fi
 

diff --git a/src/Makevars.in b/src/Makevars.in
@@ -4,7 +4,10 @@ PKG_CFLAGS = -pthread $(C_VISIBILITY)
 PKG_LIBS = -L$(LIBDIR) -lmyrustlib -lresolv -pthread
 CARGO = @cargobin@
 
-#all: clean
+# CRAN policy forbids using $HOME
+#export CARGO_HOME=$TMPDIR/.cargo
+
+all: clean
 
 $(SHLIB): $(STATLIB)