Skip to content

Commit d5699f9

Browse files
committed
Use -j 2 for CRAN
1 parent 64757ce commit d5699f9

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

DESCRIPTION

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ Version: 1.12.0-2
55
Authors@R: c(
66
person("Jeroen", "Ooms", ,"jeroen@berkeley.edu", role = c("aut", "cre"),
77
comment = c(ORCID = "0000-0002-4035-0289")),
8-
person("Kornel Lesiński", role = "cph", comment = "Gifski Rust library"),
9-
person("Authors of the dependency Rust crates", role = "cph",
8+
person("Kornel Lesiński", role = "aut", comment = "Gifski Rust library"),
9+
person("Authors of the dependency Rust crates", role = "aut",
1010
comment = "see AUTHORS file"))
1111
Description: Multi-threaded GIF encoder written in Rust: <https://gif.ski/>.
1212
Converts images to GIF animations using pngquant's efficient cross-frame

NEWS

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
1.12.0-2
22
- Vendor rust code as requested by CRAN
3+
- CRAN request: use role="aut" for rust dependencies
4+
- CRAN request: use -j2 instead of CARGO_BUILD_JOBS=2
35

46
1.12.0-1
57
- Windows: add -lntdll linker flag required by Rust 1.70

src/Makevars

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,11 @@ $(SHLIB): $(STATLIB)
88

99
# CRAN wants to avoid writing in $HOME
1010
export CARGO_HOME=$(PWD)/.cargo
11+
CRANFLAGS=-j 2
1112

1213
$(STATLIB):
1314
if [ -f myrustlib/vendor.tar.xz ]; then tar xf myrustlib/vendor.tar.xz && mkdir -p $(CARGO_HOME) && cp myrustlib/vendor-config.toml $(CARGO_HOME)/config.toml; fi
14-
PATH="$(HOME)/.cargo/bin:$(PATH)" cargo build --release --manifest-path=myrustlib/Cargo.toml
15+
PATH="$(HOME)/.cargo/bin:$(PATH)" cargo build ${CRANFLAGS} --release --manifest-path=myrustlib/Cargo.toml
1516
rm -Rf $(CARGO_HOME) vendor || true
1617
rm -Rf $(LIBDIR)/build || true
1718

0 commit comments

Comments
 (0)