devxy/r-builds
Watch
2
0
Fork
You've already forked r-builds
 0
Code Issues 1 Pull requests Releases Activity

Merge pull request #206 from rstudio/fix/deflate-debian

Browse source 
Fix libdeflate dep on Debian 11, 12 as well
This commit is contained in:
Gábor Csárdi 2024-02-21 20:19:02 +01:00 • committed by GitHub
commit 401bbd29c3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 12 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
builder/package.debian-11
View file

@ -11,6 +11,11 @@ if [[ "${R_VERSION}" =~ ^3 ]]; then
- libpcre3-dev' - libpcre3-dev'
fi fi
deflate_libs='# - libdeflate-dev'
if grep -q '^LIBS *=.*[-]ldeflate' ${R_INSTALL_PATH}/lib/R/etc/Makeconf; then
deflate_libs='- libdeflate-dev'
fi
cat <<EOF > /tmp/nfpm.yml cat <<EOF > /tmp/nfpm.yml
name: r-${R_VERSION} name: r-${R_VERSION}
version: 1 version: 1
@ -36,6 +41,7 @@ depends:
- libc6 - libc6
- libcairo2 - libcairo2
- libcurl4-openssl-dev - libcurl4-openssl-dev
${deflate_libs}
- libglib2.0-0 - libglib2.0-0
- libgomp1 - libgomp1
- libicu-dev - libicu-dev

6
builder/package.debian-12
View file

@ -11,6 +11,11 @@ if [[ "${R_VERSION}" =~ ^3 ]]; then
- libpcre3-dev' - libpcre3-dev'
fi fi
deflate_libs='# - libdeflate-dev'
if grep -q '^LIBS *=.*[-]ldeflate' ${R_INSTALL_PATH}/lib/R/etc/Makeconf; then
deflate_libs='- libdeflate-dev'
fi
cat <<EOF > /tmp/nfpm.yml cat <<EOF > /tmp/nfpm.yml
name: r-${R_VERSION} name: r-${R_VERSION}
version: 1 version: 1
@ -36,6 +41,7 @@ depends:
- libc6 - libc6
- libcairo2 - libcairo2
- libcurl4-openssl-dev - libcurl4-openssl-dev
${deflate_libs}
- libglib2.0-0 - libglib2.0-0
- libgomp1 - libgomp1
- libicu-dev - libicu-dev