Skip to content

Commit d8355be

Browse files
committed
Try to please CRAN
1 parent 90ab23b commit d8355be

File tree

3 files changed

+10
-2
lines changed

3 files changed

+10
-2
lines changed

DESCRIPTION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Package: gifski
22
Type: Package
33
Title: Highest Quality GIF Encoder
4-
Version: 0.8.6
4+
Version: 0.8.6.1
55
Authors@R: c(
66
person("Jeroen", "Ooms", ,"[email protected]", role = c("aut", "cre"),
77
comment = c(ORCID = "0000-0002-4035-0289")),

configure

+5
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@ if [ $? -eq 0 ]; then
88
VERSION=$($CARGO --version)
99
echo "Using $CARGO ($VERSION)"
1010
sed -e "s|@cargobin@|$CARGO|" src/Makevars.in > src/Makevars
11+
12+
# CRAN forbids using $HOME during CMD check; try to override cargo
13+
if [ "$CARGO" == "/usr/bin/cargo" ] && [ -z "CARGO_HOME" ] && [ "$_R_CHECK_SIZE_OF_TARBALL_" ]; then
14+
sed -i.bak "s|#export|export|" src/Makevars
15+
fi
1116
exit 0
1217
fi
1318

src/Makevars.in

+4-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,10 @@ PKG_CFLAGS = -pthread $(C_VISIBILITY)
44
PKG_LIBS = -L$(LIBDIR) -lmyrustlib -lresolv -pthread
55
CARGO = @cargobin@
66

7-
#all: clean
7+
# CRAN policy forbids using $HOME
8+
#export CARGO_HOME=$TMPDIR/.cargo
9+
10+
all: clean
811

912
$(SHLIB): $(STATLIB)
1013

0 commit comments

Comments
 (0)