# HG changeset patch # User Rich Burridge # Date 1489435106 25200 # Node ID 594dd2cf6dec82c09e027b9fcbbb5f8b341b8fcc # Parent 563f6643584587f2d602232e4e2293dba71366d9 25712939 R doesn't like zlib 1.2.10+ diff -r 563f66435845 -r 594dd2cf6dec components/r/patches/01-fix-zlib-fail.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/r/patches/01-fix-zlib-fail.patch Mon Mar 13 12:58:26 2017 -0700 @@ -0,0 +1,24 @@ +zlib version check fails + +Fix is already committed upstream. See: + +https://bugs.r-project.org/bugzilla3/show_bug.cgi?id=17204 + +--- R-3.3.2/m4/R.m4.orig 2017-03-13 11:20:03.514638624 +0000 ++++ R-3.3.2/m4/R.m4 2017-03-13 11:20:49.190468317 +0000 +@@ -3113,10 +3113,11 @@ + #include + #include + 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); ++#ifdef ZLIB_VERNUM ++ if (ZLIB_VERNUM < 0x1250) { ++ exit(1); ++ } ++ exit(0); + #else + exit(1); + #endif