Skip to content
Snippets Groups Projects
Commit 743348c7 authored by Stefan Anzinger's avatar Stefan Anzinger
Browse files

Use patch instead of ed when fixing gnur configure script.

parent 81777120
No related branches found
No related tags found
No related merge requests found
......@@ -57,11 +57,7 @@ all: Makefile $(GNUR_HOME) iconv config build
$(GNUR_HOME):
tar xf $(TOPDIR)/../libdownloads/R-$(R_VERSION).tar.gz
# Solaris doesn't need this and ed can't handle the size of the configure file!
ifneq ($(OSNAME), SunOS)
ed $(GNUR_HOME)/configure < edconfigure # to fix the zlib version check (fixed in GNUR in the meantime)
endif
(cd $(GNUR_HOME) && patch < $(TOPDIR)/gnur/configure.patch) # to fix the zlib version check (fixed in GNUR in the meantime)
# After this platform check, GNUR_CONFIG_FLAGS must be set
ifeq ($(OSNAME), SunOS)
......
--- ./R-3.3.2/configure Mon Oct 24 04:34:26 2016
+++ ./configure.new Wed Jul 26 04:43:08 2017
@@ -35507,10 +35507,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
35510,35513c
#ifdef ZLIB_VERNUM
if (ZLIB_VERNUM < 0x1250) {
exit(1);
}
exit(0);
.
w
q
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment