From 2317e4c57569ec67b83b2e22490cf09c2cfe9b66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor=20Cs=C3=A1rdi?= Date: Wed, 21 Feb 2024 10:39:53 +0100 Subject: [PATCH] Fix libdeflate dep on Debian 11, 12 as well To fix up #204. --- builder/package.debian-11 | 6 ++++++ builder/package.debian-12 | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/builder/package.debian-11 b/builder/package.debian-11 index 03be1b4..ad97ab9 100644 --- a/builder/package.debian-11 +++ b/builder/package.debian-11 @@ -11,6 +11,11 @@ if [[ "${R_VERSION}" =~ ^3 ]]; then - libpcre3-dev' fi +deflate_libs='# - libdeflate-dev' +if grep -q '^LIBS *=.*[-]ldeflate' ${R_INSTALL_PATH}/lib/R/etc/Makeconf; then + deflate_libs='- libdeflate-dev' +fi + cat < /tmp/nfpm.yml name: r-${R_VERSION} version: 1 @@ -36,6 +41,7 @@ depends: - libc6 - libcairo2 - libcurl4-openssl-dev +${deflate_libs} - libglib2.0-0 - libgomp1 - libicu-dev diff --git a/builder/package.debian-12 b/builder/package.debian-12 index c7673d5..79bf036 100644 --- a/builder/package.debian-12 +++ b/builder/package.debian-12 @@ -11,6 +11,11 @@ if [[ "${R_VERSION}" =~ ^3 ]]; then - libpcre3-dev' fi +deflate_libs='# - libdeflate-dev' +if grep -q '^LIBS *=.*[-]ldeflate' ${R_INSTALL_PATH}/lib/R/etc/Makeconf; then + deflate_libs='- libdeflate-dev' +fi + cat < /tmp/nfpm.yml name: r-${R_VERSION} version: 1 @@ -36,6 +41,7 @@ depends: - libc6 - libcairo2 - libcurl4-openssl-dev +${deflate_libs} - libglib2.0-0 - libgomp1 - libicu-dev