| author | Rich Burridge <rich.burridge@oracle.com> |
| Thu, 16 Mar 2017 12:24:20 -0700 | |
| changeset 7768 | b2bf3840279b |
| parent 7742 | 594dd2cf6dec |
| permissions | -rw-r--r-- |
|
7742
594dd2cf6dec
25712939 R doesn't like zlib 1.2.10+
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
1 |
zlib version check fails |
|
594dd2cf6dec
25712939 R doesn't like zlib 1.2.10+
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
2 |
|
|
7768
b2bf3840279b
25712939 R doesn't like zlib 1.2.10+ (fix build)
Rich Burridge <rich.burridge@oracle.com>
parents:
7742
diff
changeset
|
3 |
The proper fix is already committed upstream. See: |
|
7742
594dd2cf6dec
25712939 R doesn't like zlib 1.2.10+
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
4 |
|
|
594dd2cf6dec
25712939 R doesn't like zlib 1.2.10+
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
5 |
https://bugs.r-project.org/bugzilla3/show_bug.cgi?id=17204 |
|
594dd2cf6dec
25712939 R doesn't like zlib 1.2.10+
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
6 |
|
|
7768
b2bf3840279b
25712939 R doesn't like zlib 1.2.10+ (fix build)
Rich Burridge <rich.burridge@oracle.com>
parents:
7742
diff
changeset
|
7 |
For now we just patch the configure script to solve the problem. |
|
b2bf3840279b
25712939 R doesn't like zlib 1.2.10+ (fix build)
Rich Burridge <rich.burridge@oracle.com>
parents:
7742
diff
changeset
|
8 |
When R is updated to version 3.3.3 (CR #25681843), then the real fix will |
|
b2bf3840279b
25712939 R doesn't like zlib 1.2.10+ (fix build)
Rich Burridge <rich.burridge@oracle.com>
parents:
7742
diff
changeset
|
9 |
take affect and this patch can be removed. |
|
b2bf3840279b
25712939 R doesn't like zlib 1.2.10+ (fix build)
Rich Burridge <rich.burridge@oracle.com>
parents:
7742
diff
changeset
|
10 |
|
|
b2bf3840279b
25712939 R doesn't like zlib 1.2.10+ (fix build)
Rich Burridge <rich.burridge@oracle.com>
parents:
7742
diff
changeset
|
11 |
--- R-3.3.2/configure.orig 2017-03-16 10:57:21.167034116 +0000 |
|
b2bf3840279b
25712939 R doesn't like zlib 1.2.10+ (fix build)
Rich Burridge <rich.burridge@oracle.com>
parents:
7742
diff
changeset
|
12 |
+++ R-3.3.2/configure 2017-03-16 10:58:12.704864360 +0000 |
|
b2bf3840279b
25712939 R doesn't like zlib 1.2.10+ (fix build)
Rich Burridge <rich.burridge@oracle.com>
parents:
7742
diff
changeset
|
13 |
@@ -35507,10 +35507,11 @@ |
|
7742
594dd2cf6dec
25712939 R doesn't like zlib 1.2.10+
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
14 |
#include <string.h> |
|
594dd2cf6dec
25712939 R doesn't like zlib 1.2.10+
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
15 |
#include <zlib.h> |
|
594dd2cf6dec
25712939 R doesn't like zlib 1.2.10+
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
16 |
int main() {
|
|
594dd2cf6dec
25712939 R doesn't like zlib 1.2.10+
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
17 |
-#ifdef ZLIB_VERSION |
|
594dd2cf6dec
25712939 R doesn't like zlib 1.2.10+
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
18 |
-/* Work around Debian bug: it uses 1.2.3.4 even though there was no such |
|
594dd2cf6dec
25712939 R doesn't like zlib 1.2.10+
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
19 |
- version on the master site zlib.net */ |
|
594dd2cf6dec
25712939 R doesn't like zlib 1.2.10+
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
20 |
- exit(strncmp(ZLIB_VERSION, "1.2.5", 5) < 0); |
|
594dd2cf6dec
25712939 R doesn't like zlib 1.2.10+
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
21 |
+#ifdef ZLIB_VERNUM |
|
594dd2cf6dec
25712939 R doesn't like zlib 1.2.10+
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
22 |
+ if (ZLIB_VERNUM < 0x1250) {
|
|
594dd2cf6dec
25712939 R doesn't like zlib 1.2.10+
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
23 |
+ exit(1); |
|
594dd2cf6dec
25712939 R doesn't like zlib 1.2.10+
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
24 |
+ } |
|
594dd2cf6dec
25712939 R doesn't like zlib 1.2.10+
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
25 |
+ exit(0); |
|
594dd2cf6dec
25712939 R doesn't like zlib 1.2.10+
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
26 |
#else |
|
594dd2cf6dec
25712939 R doesn't like zlib 1.2.10+
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
27 |
exit(1); |
|
594dd2cf6dec
25712939 R doesn't like zlib 1.2.10+
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
28 |
#endif |