From 81f95b3b997538ac0f5263bd3ead7d618cdc45a7 Mon Sep 17 00:00:00 2001 From: miqlas Date: Sun, 12 Feb 2017 22:15:34 +0100 Subject: [PATCH] R: enable shared lib, fix zlib problem (#1147) --- dev-lang/r/patches/r-3.3.2.patchset | 22 ++++++++++++++++++++++ dev-lang/r/r-3.3.2.recipe | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 dev-lang/r/patches/r-3.3.2.patchset diff --git a/dev-lang/r/patches/r-3.3.2.patchset b/dev-lang/r/patches/r-3.3.2.patchset new file mode 100644 index 000000000..c837139c5 --- /dev/null +++ b/dev-lang/r/patches/r-3.3.2.patchset @@ -0,0 +1,22 @@ +From e4ed00e298561563a05681b23b1ad3ff4f8e30f1 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= +Date: Sat, 11 Feb 2017 09:03:25 +0100 +Subject: zlib detection patch (already fixed upstream) + + +diff --git a/configure b/configure +index cf368ce..6759b3c 100755 +--- a/configure ++++ b/configure +@@ -35510,7 +35510,7 @@ int main() { + #ifdef ZLIB_VERSION + /* Work around Debian bug: it uses 1.2.3.4 even though there was no such + version on the master site zlib.net */ +- exit(strncmp(ZLIB_VERSION, "1.2.5", 5) < 0); ++ exit(ZLIB_VERNUM < 0x1250); + #else + exit(1); + #endif +-- +2.11.0 + diff --git a/dev-lang/r/r-3.3.2.recipe b/dev-lang/r/r-3.3.2.recipe index 7111ac1c3..d6dd20238 100644 --- a/dev-lang/r/r-3.3.2.recipe +++ b/dev-lang/r/r-3.3.2.recipe @@ -17,6 +17,7 @@ REVISION="1" SOURCE_URI="https://cloud.r-project.org/src/base/R-3/R-$portVersion.tar.gz" CHECKSUM_SHA256="d294ad21e9f574fb4828ebb3a94b8cb34f4f304a41687a994be00dd41a4e514c" SOURCE_DIR="R-$portVersion" +PATCHES="r-$portVersion.patchset" ARCHITECTURES="!x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="!x86_gcc2 x86" @@ -101,6 +102,7 @@ BUILD() runConfigure --omit-dirs sysconfdir ./configure \ --with-x=no \ --sysconfdir="$settingsDir/R" \ + --enable-R-shlib \ rdocdir="$docDir" \ rincludedir=$includeDir \ rsharedir="$dataDir/R"