gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 17:09:10 -07:00
Code Issues Projects Releases Wiki Activity

dev-lang/R: Backport patch for zlib-1.2.10 compatibility

Browse Source 
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=604676

Package-Manager: Portage-2.3.3, Repoman-2.3.1
Signed-off-by: Justin Lecher <jlec@gentoo.org>
This commit is contained in:
Justin Lecher
2017-01-05 19:25:46 +00:00
parent 8554604493
commit 17331c2f15
2 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
dev-lang/R/R-3.3.2.ebuild
View File

@@ -1,4 +1,4 @@
# Copyright 1999-2016 Gentoo Foundation
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -72,7 +72,8 @@ src_prepare() {
epatch \
"${FILESDIR}"/${PN}-2.11.1-parallel.patch \
"${FILESDIR}"/${PN}-2.13.1-zlib_header_fix.patch \
"${FILESDIR}"/${PN}-3.0.0-rmath-shared.patch
"${FILESDIR}"/${PN}-3.0.0-rmath-shared.patch \
"${FILESDIR}"/${P}-zlib-1.2.10-backport.patch
# fix packages.html for doc (gentoo bug #205103)
sed -i \

20
dev-lang/R/files/R-3.3.2-zlib-1.2.10-backport.patch Normal file
View File

@@ -0,0 +1,20 @@
Index: R.m4
===================================================================
--- m4/R.m4 (revision 71152)
+++ m4/R.m4 (revision 71889)
@@ -3105,10 +3105,11 @@
#include <string.h>
#include <zlib.h>
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