Skip to content

Commit

Permalink
Try to please CRAN
Browse files Browse the repository at this point in the history
  • Loading branch information
jeroen committed Oct 2, 2018
1 parent 3aa4e56 commit 61aea9e
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 1 deletion.
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
@@ -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")),
Expand Down
7 changes: 7 additions & 0 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,13 @@ 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_HOME
if [ "$CARGO" == "/usr/bin/cargo" ] && [ "$_R_CHECK_SIZE_OF_TARBALL_" ]; then
if [ -z "$CARGO_HOME" ] && [ ! -e "$HOME/.cargo" ]; then
sed -i.bak "s|#export|export|" src/Makevars
fi
fi
exit 0
fi

Expand Down
3 changes: 3 additions & 0 deletions src/Makevars.in
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ PKG_CFLAGS = -pthread $(C_VISIBILITY)
PKG_LIBS = -L$(LIBDIR) -lmyrustlib -lresolv -pthread
CARGO = @cargobin@

# CRAN policy forbids using $HOME
#export CARGO_HOME=$(R_PACKAGE_DIR)

#all: clean

$(SHLIB): $(STATLIB)
Expand Down

0 comments on commit 61aea9e

Please sign in to comment.