Compare commits
55 Commits
master
...
f40-riscv6
Author | SHA1 | Date | |
---|---|---|---|
2f16ac1c20 | |||
|
5eafc1034d | ||
|
20f11e0c64 | ||
|
0a181ae359 | ||
|
beb454fae1 | ||
|
47ec9620b9 | ||
|
a7a2c47513 | ||
|
18c95faef1 | ||
|
c8ddc70b14 | ||
|
0b7746f67d | ||
|
c9e2374ea9 | ||
|
59307f0bc0 | ||
|
d95b03bde3 | ||
|
87137bd1d2 | ||
|
01100a409a | ||
|
5613acfcc7 | ||
|
5d63d1bd8a | ||
|
e7d80de40e | ||
|
43988b9a39 | ||
|
7b102f9901 | ||
|
b01786f9fe | ||
|
57041b5b7a | ||
|
1f557c1cb0 | ||
|
9edfc9a566 | ||
|
c30f91d4e7 | ||
|
b97b80ba2a | ||
|
535a4fb550 | ||
|
80e8f3bb80 | ||
|
188b68f231 | ||
|
f216ce2987 | ||
|
d2a5fc949a | ||
|
8e252594fc | ||
|
cff3514236 | ||
|
8a3f472525 | ||
|
57def3310b | ||
|
d8bf4ed948 | ||
|
9b5b920f22 | ||
|
563f58cd2c | ||
|
ac33fc11de | ||
|
5b47b2c9f5 | ||
|
d175646a98 | ||
|
c236b87ba9 | ||
|
a15e05c5b4 | ||
|
42a7b36e95 | ||
|
330260ac0e | ||
|
684543effd | ||
|
e53bf67ed1 | ||
|
a723a4b8b5 | ||
|
48598cc29d | ||
|
8c9ac36255 | ||
|
85b54b8c69 | ||
|
86ca829e20 | ||
|
7286314a2a | ||
|
55e4d44c53 | ||
|
207899a22b |
13
.gitignore
vendored
13
.gitignore
vendored
@ -41,3 +41,16 @@
|
||||
/R-4.0.3.tar.gz
|
||||
/pcre-8.44.tar.bz2
|
||||
/curl-7.72.0.tar.bz2
|
||||
/R-4.0.4.tar.gz
|
||||
/R-4.0.5.tar.gz
|
||||
/R-4.1.0.tar.gz
|
||||
/R-4.1.1.tar.gz
|
||||
/R-4.1.2.tar.gz
|
||||
/R-4.1.3.tar.gz
|
||||
/R-4.2.1.tar.gz
|
||||
/R-4.2.2.tar.gz
|
||||
/R-4.2.3.tar.gz
|
||||
/R-4.3.0.tar.gz
|
||||
/R-4.3.1.tar.gz
|
||||
/R-4.3.2.tar.gz
|
||||
/R-4.3.3.tar.gz
|
||||
|
@ -1,22 +0,0 @@
|
||||
From bf674ad00579d76d5ade415ee08c62fa4a652f96 Mon Sep 17 00:00:00 2001
|
||||
From: Siteshwar Vashisht <svashisht@redhat.com>
|
||||
Date: Thu, 17 Sep 2015 10:13:24 -0400
|
||||
Subject: [PATCH] Disable backing store in X11 window
|
||||
|
||||
Xorg server will not generate Expose events if backing store is enabled. Since implementation of this X11 module relies on Expose events, we should explicitly disable backing store in X11 window.
|
||||
---
|
||||
src/modules/X11/devX11.c | 2 +-
|
||||
1 files changed, 1 insertions(+), 1 deletions(-)
|
||||
|
||||
diff -up R-3.3.0/src/modules/X11/devX11.c.disable-backing-store R-3.3.0/src/modules/X11/devX11.c
|
||||
--- R-3.3.0/src/modules/X11/devX11.c.disable-backing-store 2016-05-10 09:54:12.440997353 -0400
|
||||
+++ R-3.3.0/src/modules/X11/devX11.c 2016-05-10 09:54:48.560701316 -0400
|
||||
@@ -1479,7 +1479,7 @@ X11_Open(pDevDesc dd, pX11Desc xd, const
|
||||
memset(&attributes, 0, sizeof(attributes));
|
||||
attributes.background_pixel = whitepixel;
|
||||
attributes.border_pixel = blackpixel;
|
||||
- attributes.backing_store = Always;
|
||||
+ attributes.backing_store = NotUseful;
|
||||
attributes.event_mask = ButtonPressMask
|
||||
| PointerMotionMask
|
||||
| PointerMotionHintMask
|
@ -1,29 +0,0 @@
|
||||
From 1d2f8f70375b5d34ec7485833e20f5b78ed135ed Mon Sep 17 00:00:00 2001
|
||||
From: Siteshwar Vashisht <svashisht@redhat.com>
|
||||
Date: Thu, 17 Sep 2015 08:55:55 -0400
|
||||
Subject: [PATCH] Wait for MapNotify event while intializing window
|
||||
|
||||
---
|
||||
src/modules/X11/devX11.c | 4 ++--
|
||||
1 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/modules/X11/devX11.c b/src/modules/X11/devX11.c
|
||||
index c2eab80..b714f1a 100644
|
||||
--- a/src/modules/X11/devX11.c
|
||||
+++ b/src/modules/X11/devX11.c
|
||||
@@ -1698,10 +1698,10 @@ X11_Open(pDevDesc dd, pX11Desc xd, const char *dsp,
|
||||
XMapWindow(display, xd->window);
|
||||
XSync(display, 0);
|
||||
|
||||
- /* Gobble expose events */
|
||||
+ /* Gobble MapNotify events */
|
||||
|
||||
while ( XPeekEvent(display, &event),
|
||||
- !XCheckTypedEvent(display, Expose, &event))
|
||||
+ !XCheckTypedEvent(display, MapNotify, &event))
|
||||
;
|
||||
/* XNextEvent(display, &event);
|
||||
if (event.xany.type == Expose) {
|
||||
--
|
||||
1.7.1
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -1,149 +0,0 @@
|
||||
diff -uNr R-2.5.0/src/nmath/standalone/Makefile.in R-2.5.0-patched/src/nmath/standalone/Makefile.in
|
||||
--- R-2.5.0/src/nmath/standalone/Makefile.in 2007-03-26 18:42:08.000000000 +0200
|
||||
+++ R-2.5.0-patched/src/nmath/standalone/Makefile.in 2007-04-29 14:50:55.000000000 +0200
|
||||
@@ -67,7 +67,7 @@
|
||||
libRmath_la_LDFLAGS =
|
||||
|
||||
CLEANFILES = Makedeps *.d *.o *.lo test $(SOURCES)
|
||||
-DISTCLEANFILES = Makefile $(Rexeclibdir_LIBRARIES) $(Rexeclibdir_LTLIBRARIES)
|
||||
+DISTCLEANFILES = Makefile libRmath.pc $(Rexeclibdir_LIBRARIES) $(Rexeclibdir_LTLIBRARIES)
|
||||
|
||||
DEFS = -DHAVE_CONFIG_H -DMATHLIB_STANDALONE
|
||||
ALL_CPPFLAGS = $(R_XTRA_CPPFLAGS) -I$(srcdir)/.. $(CPPFLAGS) $(DEFS)
|
||||
@@ -78,7 +78,7 @@
|
||||
@r_cc_lo_rules_frag@
|
||||
|
||||
|
||||
-all: Makefile inc static shared
|
||||
+all: Makefile inc static shared build-pc
|
||||
|
||||
inc:
|
||||
(cd ../../include; $(MAKE) Rmath.h)
|
||||
@@ -100,6 +100,11 @@
|
||||
shared: Makefile ../../include/Rconfig.h Copy Makedeps
|
||||
@$(MAKE) $(Rexeclibdir_LTLIBRARIES)
|
||||
|
||||
+build-pc:
|
||||
+ @$(SED) -e "s:@libdir:$(libdir):" -e "s:@includedir:$(includedir):" \
|
||||
+ -e 's/@VERSION/$(VERSION)/' -e 's/@libm/$(LIBM)/' $(srcdir)/libRmath.pc.in \
|
||||
+ > "libRmath.pc"
|
||||
+
|
||||
../../include/Rconfig.h:
|
||||
(cd $(@D); $(MAKE) $(@F))
|
||||
|
||||
@@ -163,9 +168,7 @@
|
||||
|
||||
install-pc:
|
||||
@$(MKINSTALLDIRS) "$(libdir)/pkgconfig"
|
||||
- @$(SED) -e "s:@libdir:$(libdir):" -e "s:@includedir:$(includedir):" \
|
||||
- -e 's/@VERSION/$(VERSION)/' -e 's/@libm/$(LIBM)/' $(srcdir)/libRmath.pc.in \
|
||||
- > "$(libdir)/pkgconfig/libRmath.pc"
|
||||
+ @$(INSTALL_DATA) libRmath.pc "$(libdir)/pkgconfig/libRmath.pc"
|
||||
|
||||
uninstall:
|
||||
@rm -f $(includedir)/Rmath.h $(libdir)/$(libRmath_la) $(libdir)/libRmath.a "$(libdir)/pkgconfig/libRmath.pc"
|
||||
diff -uNr R-2.5.0/src/scripts/Makefile.in R-2.5.0-patched/src/scripts/Makefile.in
|
||||
--- R-2.5.0/src/scripts/Makefile.in 2007-03-26 18:42:09.000000000 +0200
|
||||
+++ R-2.5.0-patched/src/scripts/Makefile.in 2007-04-29 14:50:14.000000000 +0200
|
||||
@@ -23,17 +23,22 @@
|
||||
DISTFILES = Makefile.in Makefile.win $(SCRIPTS_S) $(SCRIPTS_B_IN) R.sh.in
|
||||
|
||||
CLEANFILES =
|
||||
-DISTCLEANFILES = Makefile R.fe R.sh $(SCRIPTS_B)
|
||||
+DISTCLEANFILES = Makefile R.fe R.fe2 R.sh $(SCRIPTS_B)
|
||||
|
||||
all: Makefile R
|
||||
|
||||
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
|
||||
@cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
|
||||
|
||||
-R: $(SCRIPTS_B) R.fe
|
||||
+R: $(SCRIPTS_B) R.fe R.fe2
|
||||
@$(MAKE) rhome=$(top_builddir) install-cmds
|
||||
@$(INSTALL_SCRIPT) R.fe $(top_builddir)/bin/R
|
||||
|
||||
+R.fe2:
|
||||
+ @(d=`echo '$(rhome)' | sed 's,/,\\\/,g';`; \
|
||||
+ sed -e "s/\\(R_HOME_DIR=\\).*/\\1$${d}/;" -e "s+\\(R_SHARE_DIR=\\).*+\\1$(rsharedir)+;" -e "s+\\(R_INCLUDE_DIR=\\).*+\\1$(rincludedir)+;" -e "s+\\(R_DOC_DIR=\\).*+\\1$(rdocdir)+;"\
|
||||
+ < R.fe > $@)
|
||||
+
|
||||
## <NOTE>
|
||||
## Seems we need target rules for creating FOO from FOO.in: pattern
|
||||
## rules ('%:%.in') are not portable, and some versions of Make do not
|
||||
@@ -95,10 +100,8 @@
|
||||
|
||||
install: installdirs install-cmds
|
||||
@rm -f $(bindir)/R
|
||||
- @(d=`echo '$(rhome)' | sed 's,/,\\\/,g';`; \
|
||||
- sed -e "s/\\(R_HOME_DIR=\\).*/\\1$${d}/;" -e "s+\\(R_SHARE_DIR=\\).*+\\1$(rsharedir)+;" -e "s+\\(R_INCLUDE_DIR=\\).*+\\1$(rincludedir)+;" -e "s+\\(R_DOC_DIR=\\).*+\\1$(rdocdir)+;"\
|
||||
- < R.fe > "$(Rexecbindir)/R")
|
||||
- @$(INSTALL_SCRIPT) "$(Rexecbindir)/R" "$(bindir)/R"
|
||||
+ @$(INSTALL_SCRIPT) R.fe2 "$(Rexecbindir)/R"
|
||||
+ @$(INSTALL_SCRIPT) R.fe2 "$(bindir)/R"
|
||||
@chmod 755 "$(bindir)/R" "$(Rexecbindir)/R"
|
||||
## why of all the scriots does this alone chmod just one copy?
|
||||
installdirs:
|
||||
diff -uNr R-2.5.0/src/unix/Makefile.in R-2.5.0-patched/src/unix/Makefile.in
|
||||
--- R-2.5.0/src/unix/Makefile.in 2007-03-26 18:41:33.000000000 +0200
|
||||
+++ R-2.5.0-patched/src/unix/Makefile.in 2007-04-29 14:51:55.000000000 +0200
|
||||
@@ -26,7 +26,7 @@
|
||||
|
||||
@WANT_R_SHLIB_TRUE@ALL_CFLAGS = $(ALL_CFLAGS_LO)
|
||||
|
||||
-all: Makefile Makedeps R
|
||||
+all: Makefile Makedeps R
|
||||
|
||||
Makefile: $(srcdir)/Makefile.in \
|
||||
$(top_builddir)/config.status \
|
||||
@@ -38,11 +38,23 @@
|
||||
@cat $(DEPENDS) >> Makefile
|
||||
@touch $@
|
||||
|
||||
-R: Makefile
|
||||
+R: Makefile
|
||||
@$(MAKE) Makedeps
|
||||
@WANT_R_SHLIB_FALSE@ @$(MAKE) libunix.a
|
||||
@WANT_R_SHLIB_TRUE@ @$(MAKE) stamp-lo
|
||||
+ @$(MAKE) rhome=$(abs_top_builddir) build-Rscript
|
||||
@$(MAKE) rhome=$(abs_top_builddir) install-Rscript
|
||||
+ @$(MAKE) build-Rscript
|
||||
+ @$(MAKE) build-pc
|
||||
+
|
||||
+build-pc:
|
||||
+ @$(SED) -e "s:@rhome:$(rhome):" -e "s:@rincludedir:$(rincludedir):" \
|
||||
+ -e 's/@VERSION/$(VERSION)/' $(srcdir)/libR.pc.in \
|
||||
+ > "libR.pc"
|
||||
+
|
||||
+build-Rscript:
|
||||
+ $(CC) $(ALL_CPPFLAGS) $(ALL_CFLAGS) -DR_HOME='"$(rhome)"' -o Rscript \
|
||||
+ $(srcdir)/Rscript.c
|
||||
|
||||
## is this portable?
|
||||
../include/Rversion.h:
|
||||
@@ -60,22 +72,19 @@
|
||||
clean:
|
||||
@-rm -rf .libs _libs
|
||||
@-rm -f Makedeps *.d *.o *.a *.lo *.la stamp-lo
|
||||
+ @-rm -f Rscript libR.pc
|
||||
distclean: clean
|
||||
@-rm -f Makefile
|
||||
maintainer-clean: distclean
|
||||
|
||||
-## we need to build at install time to capture the correct 'rhome'
|
||||
+## install previously built Rscript
|
||||
install-Rscript:
|
||||
- $(CC) $(ALL_CPPFLAGS) $(ALL_CFLAGS) -DR_HOME='"$(rhome)"' -o Rscript \
|
||||
- $(srcdir)/Rscript.c
|
||||
@$(MKINSTALLDIRS) "$(Rexecbindir)"
|
||||
@$(INSTALL_PROGRAM) Rscript "$(Rexecbindir)/Rscript"
|
||||
-## substitute at install time to allow 'prefix' to be overridden
|
||||
+## install previously built libR.pc
|
||||
install-pc:
|
||||
@$(MKINSTALLDIRS) "$(libdir)/pkgconfig"
|
||||
- @$(SED) -e "s:@rhome:$(rhome):" -e "s:@rincludedir:$(rincludedir):" \
|
||||
- -e 's/@VERSION/$(VERSION)/' $(srcdir)/libR.pc.in \
|
||||
- > "$(libdir)/pkgconfig/libR.pc"
|
||||
+ @$(INSTALL_DATA) libR.pc "$(libdir)/pkgconfig/libR.pc"
|
||||
install: install-Rscript @WANT_R_SHLIB_TRUE@ install-pc
|
||||
@$(MKINSTALLDIRS) "$(bindir)"
|
||||
@$(INSTALL_PROGRAM) Rscript "$(bindir)/Rscript"
|
@ -1,18 +0,0 @@
|
||||
Index: src/unix/Makefile.in
|
||||
===================================================================
|
||||
--- src/unix/Makefile.in (revision 45534)
|
||||
+++ src/unix/Makefile.in (revision 45535)
|
||||
@@ -78,11 +78,11 @@
|
||||
-e 's/@VERSION/$(VERSION)/' $(srcdir)/libR.pc.in \
|
||||
> "$(DESTDIR)$(libdir)/pkgconfig/libR.pc"
|
||||
|
||||
-install: install-main install-Rscript
|
||||
+install: install-main
|
||||
install: @WANT_R_SHLIB_TRUE@ install-pc
|
||||
install: @WANT_R_STATIC_TRUE@ install-pc
|
||||
|
||||
-install-main:
|
||||
+install-main: install-Rscript
|
||||
@$(MKINSTALLDIRS) "$(DESTDIR)$(bindir)"
|
||||
@$(INSTALL_PROGRAM) Rscript "$(DESTDIR)$(bindir)/Rscript"
|
||||
|
@ -1,27 +0,0 @@
|
||||
diff -up R-2.7.1/src/scripts/javareconf.BAD R-2.7.1/src/scripts/javareconf
|
||||
--- R-2.7.1/src/scripts/javareconf.BAD 2008-08-29 11:04:21.000000000 -0400
|
||||
+++ R-2.7.1/src/scripts/javareconf 2008-08-29 11:05:34.000000000 -0400
|
||||
@@ -125,16 +125,17 @@ fi
|
||||
javac_works='not present'
|
||||
if test -n "$JAVAC"; then
|
||||
javac_works='not functional'
|
||||
- rm -rf /tmp/A.java /tmp/A.class
|
||||
- echo "public class A { }" > /tmp/A.java
|
||||
- if test -e /tmp/A.java; then
|
||||
- if "${JAVAC}" /tmp/A.java >/dev/null; then
|
||||
- if test -e /tmp/A.class; then
|
||||
+ tempdir=`mktemp -d`
|
||||
+ echo "public class A { }" > ${tempdir}/A.java
|
||||
+ if test -e ${tempdir}/A.java; then
|
||||
+ if "${JAVAC}" ${tempdir}/A.java >/dev/null; then
|
||||
+ if test -e ${tempdir}/A.class; then
|
||||
javac_works=yes
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
- rm -rf /tmp/A.java /tmp/A.class
|
||||
+ rm -rf ${tempdir}
|
||||
+
|
||||
fi
|
||||
if test "${javac_works}" = yes; then
|
||||
echo "Java compiler : ${JAVAC}"
|
@ -1,11 +0,0 @@
|
||||
--- R-2.7.2/configure.org 2008-09-25 15:00:20.000000000 +0900
|
||||
+++ R-2.7.2/configure 2008-09-25 15:00:35.000000000 +0900
|
||||
@@ -26995,7 +26995,7 @@
|
||||
|
||||
;;
|
||||
# Ignore these flags.
|
||||
- -lang* | -lcrt*.o | -lc | -lgcc* | -lSystem | -libmil | -LANG:=* | -LIST:* | -LNO:*)
|
||||
+ -little | -lang* | -lcrt*.o | -lc | -lgcc* | -lSystem | -libmil | -LANG:=* | -LIST:* | -LNO:*)
|
||||
;;
|
||||
-lkernel32)
|
||||
test x"$CYGWIN" != xyes && ac_cv_f77_libs="$ac_cv_f77_libs $ac_arg"
|
@ -1,26 +0,0 @@
|
||||
diff -up R-2.8.0/configure.BAD R-2.8.0/configure
|
||||
--- R-2.8.0/configure.BAD 2008-10-26 11:51:56.000000000 -0400
|
||||
+++ R-2.8.0/configure 2008-10-26 11:52:31.000000000 -0400
|
||||
@@ -44779,6 +44779,11 @@ else
|
||||
have_bzlib=no
|
||||
fi
|
||||
if test "x${have_bzlib}" = xyes; then
|
||||
+
|
||||
+cat >>confdefs.h <<\_ACEOF
|
||||
+#define HAVE_BZLIB_H 1
|
||||
+_ACEOF
|
||||
+
|
||||
{ echo "$as_me:$LINENO: checking if bzip2 version >= 1.0.5" >&5
|
||||
echo $ECHO_N "checking if bzip2 version >= 1.0.5... $ECHO_C" >&6; }
|
||||
if test "${r_cv_have_bzlib+set}" = set; then
|
||||
diff -up R-2.8.0/m4/R.m4.BAD R-2.8.0/m4/R.m4
|
||||
--- R-2.8.0/m4/R.m4.BAD 2008-09-21 18:05:06.000000000 -0400
|
||||
+++ R-2.8.0/m4/R.m4 2008-10-26 11:53:05.000000000 -0400
|
||||
@@ -3055,6 +3055,7 @@ else
|
||||
have_bzlib=no
|
||||
fi
|
||||
if test "x${have_bzlib}" = xyes; then
|
||||
+AC_DEFINE(HAVE_BZLIB_H, 1, [Define to 1 if you have bzlib.h.])
|
||||
AC_CACHE_CHECK([if bzip2 version >= 1.0.5], [r_cv_have_bzlib],
|
||||
[AC_LANG_PUSH(C)
|
||||
r_save_LIBS="${LIBS}"
|
@ -1,32 +0,0 @@
|
||||
diff -up R-3.0.1/src/library/tools/R/install.R.armfix R-3.0.1/src/library/tools/R/install.R
|
||||
--- R-3.0.1/src/library/tools/R/install.R.armfix 2013-08-12 13:57:17.956790673 -0400
|
||||
+++ R-3.0.1/src/library/tools/R/install.R 2013-08-12 13:59:51.230800752 -0400
|
||||
@@ -108,7 +108,11 @@
|
||||
SHLIB_EXT <- if (WINDOWS) ".dll" else {
|
||||
## can we do better?
|
||||
mconf <- file.path(R.home(), paste0("etc", rarch), "Makeconf")
|
||||
- sub(".*= ", "", grep("^SHLIB_EXT", readLines(mconf), value = TRUE))
|
||||
+ if (substr( Sys.info()["machine"], 1, 3) == "arm") { # arm has broken regexps in libc
|
||||
+ sub(".*= ", "", grep("^SHLIB_EXT", readLines(mconf), value = TRUE), perl = TRUE)
|
||||
+ } else {
|
||||
+ sub(".*= ", "", grep("^SHLIB_EXT", readLines(mconf), value = TRUE))
|
||||
+ }
|
||||
}
|
||||
|
||||
options(warn = 1)
|
||||
@@ -1627,8 +1631,13 @@
|
||||
mconf <- readLines(file.path(R.home(),
|
||||
paste0("etc", Sys.getenv("R_ARCH")),
|
||||
"Makeconf"))
|
||||
- SHLIB_EXT <- sub(".*= ", "", grep("^SHLIB_EXT", mconf, value = TRUE))
|
||||
- SHLIB_LIBADD <- sub(".*= ", "", grep("^SHLIB_LIBADD", mconf, value = TRUE))
|
||||
+ if (substr( Sys.info()["machine"], 1, 3) == "arm") { # arm has broken regexps in libc
|
||||
+ SHLIB_EXT <- sub(".*= ", "", grep("^SHLIB_EXT", mconf, value = TRUE), perl = TRUE)
|
||||
+ SHLIB_LIBADD <- sub(".*= ", "", grep("^SHLIB_LIBADD", mconf, value = TRUE), perl = TRUE)
|
||||
+ } else {
|
||||
+ SHLIB_EXT <- sub(".*= ", "", grep("^SHLIB_EXT", mconf, value = TRUE))
|
||||
+ SHLIB_LIBADD <- sub(".*= ", "", grep("^SHLIB_LIBADD", mconf, value = TRUE))
|
||||
+ }
|
||||
MAKE <- Sys.getenv("MAKE")
|
||||
rarch <- Sys.getenv("R_ARCH")
|
||||
} else {
|
@ -1,571 +0,0 @@
|
||||
From a0fe05ce9d0937ad2334bb370785cb22c71e592b Mon Sep 17 00:00:00 2001
|
||||
From: lawrence <lawrence@00db46b3-68df-0310-9c12-caf00c1e9a41>
|
||||
Date: Wed, 4 Jan 2017 03:57:31 +0000
|
||||
Subject: [PATCH] R_ZLIB macro tests ZLIB_VERNUM to handle zlib 1.2.10 (6
|
||||
chars)
|
||||
|
||||
Thanks to George Hartzell for the fix.
|
||||
|
||||
|
||||
git-svn-id: https://svn.r-project.org/R/trunk@71889 00db46b3-68df-0310-9c12-caf00c1e9a41
|
||||
---
|
||||
m4/R.m4 | 9 +++++----
|
||||
1 file changed, 5 insertions(+), 4 deletions(-)
|
||||
|
||||
Index: R-3.3.2/m4/R.m4
|
||||
===================================================================
|
||||
--- R-3.3.2.orig/m4/R.m4
|
||||
+++ R-3.3.2/m4/R.m4
|
||||
@@ -3113,10 +3113,11 @@ AC_DEFUN([_R_HEADER_ZLIB],
|
||||
#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
|
||||
Index: R-3.3.2/configure
|
||||
===================================================================
|
||||
--- R-3.3.2.orig/configure
|
||||
+++ R-3.3.2/configure
|
||||
@@ -1767,11 +1767,10 @@ Optional Features:
|
||||
--enable-java enable Java [yes]
|
||||
--enable-byte-compiled-packages
|
||||
byte-compile base and recommended packages [yes]
|
||||
- --enable-static[=PKGS] (libtool) build static libraries [default=no]
|
||||
- --enable-shared[=PKGS] (libtool) build shared libraries [default=yes]
|
||||
+ --enable-static[=PKGS] build static libraries [default=no]
|
||||
+ --enable-shared[=PKGS] build shared libraries [default=yes]
|
||||
--enable-fast-install[=PKGS]
|
||||
- (libtool) optimize for fast installation
|
||||
- [default=yes]
|
||||
+ optimize for fast installation [default=yes]
|
||||
--disable-libtool-lock avoid locking (might break parallel builds)
|
||||
--enable-long-double use long double type [yes]
|
||||
--disable-openmp do not use OpenMP
|
||||
@@ -1809,11 +1808,11 @@ Optional Packages:
|
||||
--with-recommended-packages
|
||||
use/install recommended R packages [yes]
|
||||
--with-ICU use ICU library (if available) [yes]
|
||||
- --with-pic[=PKGS] (libtool) try to use only PIC/non-PIC objects
|
||||
- [default=use both]
|
||||
+ --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use
|
||||
+ both]
|
||||
--with-aix-soname=aix|svr4|both
|
||||
- (libtool( shared library versioning (aka "SONAME")
|
||||
- variant to provide on AIX, [default=aix].
|
||||
+ shared library versioning (aka "SONAME") variant to
|
||||
+ provide on AIX, [default=aix].
|
||||
--with-gnu-ld assume the C compiler uses GNU ld [default=no]
|
||||
--with-sysroot[=DIR] Search for dependent libraries within DIR (or the
|
||||
compiler's sysroot if not specified).
|
||||
@@ -3525,6 +3524,7 @@ ac_configure="$SHELL $ac_aux_dir/configu
|
||||
|
||||
|
||||
|
||||
+
|
||||
### * Information on the package.
|
||||
|
||||
PACKAGE=${PACKAGE_NAME}
|
||||
@@ -15038,6 +15038,9 @@ fi
|
||||
# before this can be enabled.
|
||||
hardcode_into_libs=yes
|
||||
|
||||
+ # Add ABI-specific directories to the system library path.
|
||||
+ sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
|
||||
+
|
||||
# Ideally, we could use ldconfig to report *all* directores which are
|
||||
# searched for libraries, however this is still not possible. Aside from not
|
||||
# being certain /sbin/ldconfig is available, command
|
||||
@@ -15046,7 +15049,7 @@ fi
|
||||
# appending ld.so.conf contents (and includes) to the search path.
|
||||
if test -f /etc/ld.so.conf; then
|
||||
lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
|
||||
- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
|
||||
+ sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
|
||||
fi
|
||||
|
||||
# We used to test for /lib/ld.so.1 and disable shared libraries on
|
||||
@@ -19000,6 +19003,9 @@ fi
|
||||
# before this can be enabled.
|
||||
hardcode_into_libs=yes
|
||||
|
||||
+ # Add ABI-specific directories to the system library path.
|
||||
+ sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
|
||||
+
|
||||
# Ideally, we could use ldconfig to report *all* directores which are
|
||||
# searched for libraries, however this is still not possible. Aside from not
|
||||
# being certain /sbin/ldconfig is available, command
|
||||
@@ -19008,7 +19014,7 @@ fi
|
||||
# appending ld.so.conf contents (and includes) to the search path.
|
||||
if test -f /etc/ld.so.conf; then
|
||||
lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
|
||||
- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
|
||||
+ sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
|
||||
fi
|
||||
|
||||
# We used to test for /lib/ld.so.1 and disable shared libraries on
|
||||
@@ -21950,6 +21956,9 @@ fi
|
||||
# before this can be enabled.
|
||||
hardcode_into_libs=yes
|
||||
|
||||
+ # Add ABI-specific directories to the system library path.
|
||||
+ sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
|
||||
+
|
||||
# Ideally, we could use ldconfig to report *all* directores which are
|
||||
# searched for libraries, however this is still not possible. Aside from not
|
||||
# being certain /sbin/ldconfig is available, command
|
||||
@@ -21958,7 +21967,7 @@ fi
|
||||
# appending ld.so.conf contents (and includes) to the search path.
|
||||
if test -f /etc/ld.so.conf; then
|
||||
lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
|
||||
- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
|
||||
+ sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
|
||||
fi
|
||||
|
||||
# We used to test for /lib/ld.so.1 and disable shared libraries on
|
||||
@@ -25065,7 +25074,7 @@ _ACEOF
|
||||
# flags.
|
||||
r_save_CFLAGS=$CFLAGS
|
||||
CFLAGS="$CFLAGS $r_verb"
|
||||
-(eval echo $as_me:25068: \"$ac_link\") >&5
|
||||
+(eval echo $as_me:25077: \"$ac_link\") >&5
|
||||
r_c_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
|
||||
echo "$r_c_v_output" >&5
|
||||
CFLAGS=$r_save_CFLAGS
|
||||
@@ -25140,7 +25149,7 @@ _ACEOF
|
||||
# flags.
|
||||
r_save_CFLAGS=$CFLAGS
|
||||
CFLAGS="$CFLAGS $r_cv_prog_c_v"
|
||||
-(eval echo $as_me:25143: \"$ac_link\") >&5
|
||||
+(eval echo $as_me:25152: \"$ac_link\") >&5
|
||||
r_c_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
|
||||
echo "$r_c_v_output" >&5
|
||||
CFLAGS=$r_save_CFLAGS
|
||||
@@ -35507,10 +35516,11 @@ else
|
||||
#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
|
||||
@@ -40840,6 +40850,9 @@ fi
|
||||
# before this can be enabled.
|
||||
hardcode_into_libs=yes
|
||||
|
||||
+ # Add ABI-specific directories to the system library path.
|
||||
+ sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
|
||||
+
|
||||
# Ideally, we could use ldconfig to report *all* directores which are
|
||||
# searched for libraries, however this is still not possible. Aside from not
|
||||
# being certain /sbin/ldconfig is available, command
|
||||
@@ -40848,7 +40861,7 @@ fi
|
||||
# appending ld.so.conf contents (and includes) to the search path.
|
||||
if test -f /etc/ld.so.conf; then
|
||||
lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
|
||||
- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
|
||||
+ sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
|
||||
fi
|
||||
|
||||
# We used to test for /lib/ld.so.1 and disable shared libraries on
|
||||
Index: R-3.3.2/tools/missing
|
||||
===================================================================
|
||||
--- R-3.3.2.orig/tools/missing
|
||||
+++ /dev/null
|
||||
@@ -1,367 +0,0 @@
|
||||
-#! /bin/sh
|
||||
-# Common stub for a few missing GNU programs while installing.
|
||||
-
|
||||
-scriptversion=2006-05-10.23
|
||||
-
|
||||
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
|
||||
-# Free Software Foundation, Inc.
|
||||
-# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
|
||||
-
|
||||
-# This program is free software; you can redistribute it and/or modify
|
||||
-# it under the terms of the GNU General Public License as published by
|
||||
-# the Free Software Foundation; either version 2, or (at your option)
|
||||
-# any later version.
|
||||
-
|
||||
-# This program is distributed in the hope that it will be useful,
|
||||
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
-# GNU General Public License for more details.
|
||||
-
|
||||
-# You should have received a copy of the GNU General Public License
|
||||
-# along with this program; if not, write to the Free Software
|
||||
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
|
||||
-# 02110-1301, USA.
|
||||
-
|
||||
-# As a special exception to the GNU General Public License, if you
|
||||
-# distribute this file as part of a program that contains a
|
||||
-# configuration script generated by Autoconf, you may include it under
|
||||
-# the same distribution terms that you use for the rest of that program.
|
||||
-
|
||||
-if test $# -eq 0; then
|
||||
- echo 1>&2 "Try \`$0 --help' for more information"
|
||||
- exit 1
|
||||
-fi
|
||||
-
|
||||
-run=:
|
||||
-sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
|
||||
-sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
|
||||
-
|
||||
-# In the cases where this matters, `missing' is being run in the
|
||||
-# srcdir already.
|
||||
-if test -f configure.ac; then
|
||||
- configure_ac=configure.ac
|
||||
-else
|
||||
- configure_ac=configure.in
|
||||
-fi
|
||||
-
|
||||
-msg="missing on your system"
|
||||
-
|
||||
-case $1 in
|
||||
---run)
|
||||
- # Try to run requested program, and just exit if it succeeds.
|
||||
- run=
|
||||
- shift
|
||||
- "$@" && exit 0
|
||||
- # Exit code 63 means version mismatch. This often happens
|
||||
- # when the user try to use an ancient version of a tool on
|
||||
- # a file that requires a minimum version. In this case we
|
||||
- # we should proceed has if the program had been absent, or
|
||||
- # if --run hadn't been passed.
|
||||
- if test $? = 63; then
|
||||
- run=:
|
||||
- msg="probably too old"
|
||||
- fi
|
||||
- ;;
|
||||
-
|
||||
- -h|--h|--he|--hel|--help)
|
||||
- echo "\
|
||||
-$0 [OPTION]... PROGRAM [ARGUMENT]...
|
||||
-
|
||||
-Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
|
||||
-error status if there is no known handling for PROGRAM.
|
||||
-
|
||||
-Options:
|
||||
- -h, --help display this help and exit
|
||||
- -v, --version output version information and exit
|
||||
- --run try to run the given command, and emulate it if it fails
|
||||
-
|
||||
-Supported PROGRAM values:
|
||||
- aclocal touch file \`aclocal.m4'
|
||||
- autoconf touch file \`configure'
|
||||
- autoheader touch file \`config.h.in'
|
||||
- autom4te touch the output file, or create a stub one
|
||||
- automake touch all \`Makefile.in' files
|
||||
- bison create \`y.tab.[ch]', if possible, from existing .[ch]
|
||||
- flex create \`lex.yy.c', if possible, from existing .c
|
||||
- help2man touch the output file
|
||||
- lex create \`lex.yy.c', if possible, from existing .c
|
||||
- makeinfo touch the output file
|
||||
- tar try tar, gnutar, gtar, then tar without non-portable flags
|
||||
- yacc create \`y.tab.[ch]', if possible, from existing .[ch]
|
||||
-
|
||||
-Send bug reports to <bug-automake@gnu.org>."
|
||||
- exit $?
|
||||
- ;;
|
||||
-
|
||||
- -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
|
||||
- echo "missing $scriptversion (GNU Automake)"
|
||||
- exit $?
|
||||
- ;;
|
||||
-
|
||||
- -*)
|
||||
- echo 1>&2 "$0: Unknown \`$1' option"
|
||||
- echo 1>&2 "Try \`$0 --help' for more information"
|
||||
- exit 1
|
||||
- ;;
|
||||
-
|
||||
-esac
|
||||
-
|
||||
-# Now exit if we have it, but it failed. Also exit now if we
|
||||
-# don't have it and --version was passed (most likely to detect
|
||||
-# the program).
|
||||
-case $1 in
|
||||
- lex|yacc)
|
||||
- # Not GNU programs, they don't have --version.
|
||||
- ;;
|
||||
-
|
||||
- tar)
|
||||
- if test -n "$run"; then
|
||||
- echo 1>&2 "ERROR: \`tar' requires --run"
|
||||
- exit 1
|
||||
- elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
|
||||
- exit 1
|
||||
- fi
|
||||
- ;;
|
||||
-
|
||||
- *)
|
||||
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
|
||||
- # We have it, but it failed.
|
||||
- exit 1
|
||||
- elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
|
||||
- # Could not run --version or --help. This is probably someone
|
||||
- # running `$TOOL --version' or `$TOOL --help' to check whether
|
||||
- # $TOOL exists and not knowing $TOOL uses missing.
|
||||
- exit 1
|
||||
- fi
|
||||
- ;;
|
||||
-esac
|
||||
-
|
||||
-# If it does not exist, or fails to run (possibly an outdated version),
|
||||
-# try to emulate it.
|
||||
-case $1 in
|
||||
- aclocal*)
|
||||
- echo 1>&2 "\
|
||||
-WARNING: \`$1' is $msg. You should only need it if
|
||||
- you modified \`acinclude.m4' or \`${configure_ac}'. You might want
|
||||
- to install the \`Automake' and \`Perl' packages. Grab them from
|
||||
- any GNU archive site."
|
||||
- touch aclocal.m4
|
||||
- ;;
|
||||
-
|
||||
- autoconf)
|
||||
- echo 1>&2 "\
|
||||
-WARNING: \`$1' is $msg. You should only need it if
|
||||
- you modified \`${configure_ac}'. You might want to install the
|
||||
- \`Autoconf' and \`GNU m4' packages. Grab them from any GNU
|
||||
- archive site."
|
||||
- touch configure
|
||||
- ;;
|
||||
-
|
||||
- autoheader)
|
||||
- echo 1>&2 "\
|
||||
-WARNING: \`$1' is $msg. You should only need it if
|
||||
- you modified \`acconfig.h' or \`${configure_ac}'. You might want
|
||||
- to install the \`Autoconf' and \`GNU m4' packages. Grab them
|
||||
- from any GNU archive site."
|
||||
- files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
|
||||
- test -z "$files" && files="config.h"
|
||||
- touch_files=
|
||||
- for f in $files; do
|
||||
- case $f in
|
||||
- *:*) touch_files="$touch_files "`echo "$f" |
|
||||
- sed -e 's/^[^:]*://' -e 's/:.*//'`;;
|
||||
- *) touch_files="$touch_files $f.in";;
|
||||
- esac
|
||||
- done
|
||||
- touch $touch_files
|
||||
- ;;
|
||||
-
|
||||
- automake*)
|
||||
- echo 1>&2 "\
|
||||
-WARNING: \`$1' is $msg. You should only need it if
|
||||
- you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
|
||||
- You might want to install the \`Automake' and \`Perl' packages.
|
||||
- Grab them from any GNU archive site."
|
||||
- find . -type f -name Makefile.am -print |
|
||||
- sed 's/\.am$/.in/' |
|
||||
- while read f; do touch "$f"; done
|
||||
- ;;
|
||||
-
|
||||
- autom4te)
|
||||
- echo 1>&2 "\
|
||||
-WARNING: \`$1' is needed, but is $msg.
|
||||
- You might have modified some files without having the
|
||||
- proper tools for further handling them.
|
||||
- You can get \`$1' as part of \`Autoconf' from any GNU
|
||||
- archive site."
|
||||
-
|
||||
- file=`echo "$*" | sed -n "$sed_output"`
|
||||
- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
|
||||
- if test -f "$file"; then
|
||||
- touch $file
|
||||
- else
|
||||
- test -z "$file" || exec >$file
|
||||
- echo "#! /bin/sh"
|
||||
- echo "# Created by GNU Automake missing as a replacement of"
|
||||
- echo "# $ $@"
|
||||
- echo "exit 0"
|
||||
- chmod +x $file
|
||||
- exit 1
|
||||
- fi
|
||||
- ;;
|
||||
-
|
||||
- bison|yacc)
|
||||
- echo 1>&2 "\
|
||||
-WARNING: \`$1' $msg. You should only need it if
|
||||
- you modified a \`.y' file. You may need the \`Bison' package
|
||||
- in order for those modifications to take effect. You can get
|
||||
- \`Bison' from any GNU archive site."
|
||||
- rm -f y.tab.c y.tab.h
|
||||
- if test $# -ne 1; then
|
||||
- eval LASTARG="\${$#}"
|
||||
- case $LASTARG in
|
||||
- *.y)
|
||||
- SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
|
||||
- if test -f "$SRCFILE"; then
|
||||
- cp "$SRCFILE" y.tab.c
|
||||
- fi
|
||||
- SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
|
||||
- if test -f "$SRCFILE"; then
|
||||
- cp "$SRCFILE" y.tab.h
|
||||
- fi
|
||||
- ;;
|
||||
- esac
|
||||
- fi
|
||||
- if test ! -f y.tab.h; then
|
||||
- echo >y.tab.h
|
||||
- fi
|
||||
- if test ! -f y.tab.c; then
|
||||
- echo 'main() { return 0; }' >y.tab.c
|
||||
- fi
|
||||
- ;;
|
||||
-
|
||||
- lex|flex)
|
||||
- echo 1>&2 "\
|
||||
-WARNING: \`$1' is $msg. You should only need it if
|
||||
- you modified a \`.l' file. You may need the \`Flex' package
|
||||
- in order for those modifications to take effect. You can get
|
||||
- \`Flex' from any GNU archive site."
|
||||
- rm -f lex.yy.c
|
||||
- if test $# -ne 1; then
|
||||
- eval LASTARG="\${$#}"
|
||||
- case $LASTARG in
|
||||
- *.l)
|
||||
- SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
|
||||
- if test -f "$SRCFILE"; then
|
||||
- cp "$SRCFILE" lex.yy.c
|
||||
- fi
|
||||
- ;;
|
||||
- esac
|
||||
- fi
|
||||
- if test ! -f lex.yy.c; then
|
||||
- echo 'main() { return 0; }' >lex.yy.c
|
||||
- fi
|
||||
- ;;
|
||||
-
|
||||
- help2man)
|
||||
- echo 1>&2 "\
|
||||
-WARNING: \`$1' is $msg. You should only need it if
|
||||
- you modified a dependency of a manual page. You may need the
|
||||
- \`Help2man' package in order for those modifications to take
|
||||
- effect. You can get \`Help2man' from any GNU archive site."
|
||||
-
|
||||
- file=`echo "$*" | sed -n "$sed_output"`
|
||||
- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
|
||||
- if test -f "$file"; then
|
||||
- touch $file
|
||||
- else
|
||||
- test -z "$file" || exec >$file
|
||||
- echo ".ab help2man is required to generate this page"
|
||||
- exit 1
|
||||
- fi
|
||||
- ;;
|
||||
-
|
||||
- makeinfo)
|
||||
- echo 1>&2 "\
|
||||
-WARNING: \`$1' is $msg. You should only need it if
|
||||
- you modified a \`.texi' or \`.texinfo' file, or any other file
|
||||
- indirectly affecting the aspect of the manual. The spurious
|
||||
- call might also be the consequence of using a buggy \`make' (AIX,
|
||||
- DU, IRIX). You might want to install the \`Texinfo' package or
|
||||
- the \`GNU make' package. Grab either from any GNU archive site."
|
||||
- # The file to touch is that specified with -o ...
|
||||
- file=`echo "$*" | sed -n "$sed_output"`
|
||||
- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
|
||||
- if test -z "$file"; then
|
||||
- # ... or it is the one specified with @setfilename ...
|
||||
- infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
|
||||
- file=`sed -n '
|
||||
- /^@setfilename/{
|
||||
- s/.* \([^ ]*\) *$/\1/
|
||||
- p
|
||||
- q
|
||||
- }' $infile`
|
||||
- # ... or it is derived from the source name (dir/f.texi becomes f.info)
|
||||
- test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
|
||||
- fi
|
||||
- # If the file does not exist, the user really needs makeinfo;
|
||||
- # let's fail without touching anything.
|
||||
- test -f $file || exit 1
|
||||
- touch $file
|
||||
- ;;
|
||||
-
|
||||
- tar)
|
||||
- shift
|
||||
-
|
||||
- # We have already tried tar in the generic part.
|
||||
- # Look for gnutar/gtar before invocation to avoid ugly error
|
||||
- # messages.
|
||||
- if (gnutar --version > /dev/null 2>&1); then
|
||||
- gnutar "$@" && exit 0
|
||||
- fi
|
||||
- if (gtar --version > /dev/null 2>&1); then
|
||||
- gtar "$@" && exit 0
|
||||
- fi
|
||||
- firstarg="$1"
|
||||
- if shift; then
|
||||
- case $firstarg in
|
||||
- *o*)
|
||||
- firstarg=`echo "$firstarg" | sed s/o//`
|
||||
- tar "$firstarg" "$@" && exit 0
|
||||
- ;;
|
||||
- esac
|
||||
- case $firstarg in
|
||||
- *h*)
|
||||
- firstarg=`echo "$firstarg" | sed s/h//`
|
||||
- tar "$firstarg" "$@" && exit 0
|
||||
- ;;
|
||||
- esac
|
||||
- fi
|
||||
-
|
||||
- echo 1>&2 "\
|
||||
-WARNING: I can't seem to be able to run \`tar' with the given arguments.
|
||||
- You may want to install GNU tar or Free paxutils, or check the
|
||||
- command line arguments."
|
||||
- exit 1
|
||||
- ;;
|
||||
-
|
||||
- *)
|
||||
- echo 1>&2 "\
|
||||
-WARNING: \`$1' is needed, and is $msg.
|
||||
- You might have modified some files without having the
|
||||
- proper tools for further handling them. Check the \`README' file,
|
||||
- it often tells you about the needed prerequisites for installing
|
||||
- this package. You may also peek at any GNU archive site, in case
|
||||
- some other package would contain this missing \`$1' program."
|
||||
- exit 1
|
||||
- ;;
|
||||
-esac
|
||||
-
|
||||
-exit 0
|
||||
-
|
||||
-# Local variables:
|
||||
-# eval: (add-hook 'write-file-hooks 'time-stamp)
|
||||
-# time-stamp-start: "scriptversion="
|
||||
-# time-stamp-format: "%:y-%02m-%02d.%02H"
|
||||
-# time-stamp-end: "$"
|
||||
-# End:
|
||||
Index: R-3.3.2/configure.ac
|
||||
===================================================================
|
||||
--- R-3.3.2.orig/configure.ac
|
||||
+++ R-3.3.2/configure.ac
|
||||
@@ -33,6 +33,7 @@ m4_define([R_VERSION],
|
||||
AC_INIT([R],[R_VERSION],[https://bugs.r-project.org],[R],[https://www.r-project.org])
|
||||
AC_CONFIG_SRCDIR([src/include/Defn.h])
|
||||
AC_CONFIG_AUX_DIR([tools])
|
||||
+AC_CONFIG_MACRO_DIRS([m4])
|
||||
|
||||
### * Information on the package.
|
||||
|
@ -1,16 +0,0 @@
|
||||
diff -up R-3.6.2/src/main/arithmetic.c.ppc64 R-3.6.2/src/main/arithmetic.c
|
||||
--- R-3.6.2/src/main/arithmetic.c.ppc64 2019-10-18 18:15:02.000000000 -0400
|
||||
+++ R-3.6.2/src/main/arithmetic.c 2019-12-18 09:05:50.363220122 -0500
|
||||
@@ -177,7 +177,12 @@ void attribute_hidden InitArithmetic()
|
||||
}
|
||||
|
||||
#if HAVE_LONG_DOUBLE && (SIZEOF_LONG_DOUBLE > SIZEOF_DOUBLE)
|
||||
+# ifdef __PPC64__
|
||||
+ // PowerPC 64 (when gcc has -mlong-double-128) fails constant folding with LDOUBLE
|
||||
+# define q_1_eps (1 / LDBL_EPSILON)
|
||||
+# else
|
||||
static LDOUBLE q_1_eps = 1 / LDBL_EPSILON;
|
||||
+# endif
|
||||
#else
|
||||
static double q_1_eps = 1 / DBL_EPSILON;
|
||||
#endif
|
@ -1,50 +0,0 @@
|
||||
diff -up R-4.0.0/src/main/machar.c.ppc64 R-4.0.0/src/main/machar.c
|
||||
--- R-4.0.0/src/main/machar.c.ppc64 2020-06-02 14:42:18.741222048 -0400
|
||||
+++ R-4.0.0/src/main/machar.c 2020-06-02 14:44:26.523106368 -0400
|
||||
@@ -98,21 +98,22 @@ MACH_NAME(int *ibeta, int *it, int *irnd
|
||||
{
|
||||
volatile DTYPE a, b, beta, betain, betah, one,
|
||||
t, temp, tempa, temp1, two, y, z, zero;
|
||||
- int i, itemp, iz, j, k, mx, nxres;
|
||||
+ int i, iz, j, k, mx, nxres;
|
||||
|
||||
one = 1;
|
||||
two = one+one;
|
||||
zero = one-one;
|
||||
|
||||
/* determine ibeta, beta ala malcolm. */
|
||||
-
|
||||
- a = one;
|
||||
+ a = one; // a = <large> = 9.0072e+15 for 'double' is used later
|
||||
do {
|
||||
a = a + a;
|
||||
temp = a + one;
|
||||
temp1 = temp - a;
|
||||
}
|
||||
while(temp1 - one == zero);
|
||||
+#ifdef _no_longer___did_overflow_ // on IBM PowerPPC ('Power 8')
|
||||
+ int itemp;
|
||||
b = one;
|
||||
do {
|
||||
b = b + b;
|
||||
@@ -121,6 +122,9 @@ MACH_NAME(int *ibeta, int *it, int *irnd
|
||||
}
|
||||
while (itemp == 0);
|
||||
*ibeta = itemp;
|
||||
+#else
|
||||
+ *ibeta = (int) FLT_RADIX;
|
||||
+#endif
|
||||
beta = *ibeta;
|
||||
|
||||
/* determine it, irnd */
|
||||
diff -up R-4.0.0/src/main/platform.c.ppc64 R-4.0.0/src/main/platform.c
|
||||
--- R-4.0.0/src/main/platform.c.ppc64 2020-06-02 14:44:40.940754817 -0400
|
||||
+++ R-4.0.0/src/main/platform.c 2020-06-02 14:45:08.940072121 -0400
|
||||
@@ -43,6 +43,7 @@
|
||||
#include <Rinterface.h>
|
||||
#include <Fileio.h>
|
||||
#include <ctype.h> /* toupper */
|
||||
+#include <float.h> // -> FLT_RADIX
|
||||
#include <limits.h>
|
||||
#include <string.h>
|
||||
#include <stdlib.h> /* for realpath */
|
4274
R-FAQ.html
4274
R-FAQ.html
File diff suppressed because it is too large
Load Diff
7180
R-admin.html
7180
R-admin.html
File diff suppressed because it is too large
Load Diff
3181
R-data.html
3181
R-data.html
File diff suppressed because it is too large
Load Diff
16101
R-exts.html
16101
R-exts.html
File diff suppressed because it is too large
Load Diff
9612
R-intro.html
9612
R-intro.html
File diff suppressed because it is too large
Load Diff
5805
R-ints.html
5805
R-ints.html
File diff suppressed because it is too large
Load Diff
6225
R-lang.html
6225
R-lang.html
File diff suppressed because it is too large
Load Diff
7
R.csh
7
R.csh
@ -1,7 +0,0 @@
|
||||
# Some R modules are not smart enough to ask R for the value of RHOME
|
||||
# and instead depend on the R_HOME environment variable.
|
||||
# Set R_HOME only if it is not already set.
|
||||
if ( ${?R_HOME} == 0 ) then
|
||||
set RHOME = `R RHOME`
|
||||
setenv R_HOME $RHOME
|
||||
endif
|
4
R.sh
4
R.sh
@ -1,4 +0,0 @@
|
||||
# Some R modules are not smart enough to ask R for the value of RHOME
|
||||
# and instead depend on the R_HOME environment variable.
|
||||
# Set R_HOME only if it is not already set.
|
||||
test "a$R_HOME" = "a" && export R_HOME="`R RHOME`"
|
@ -1,2 +0,0 @@
|
||||
[koji]
|
||||
targets = epel8 epel8-playground
|
7
sources
7
sources
@ -1,6 +1 @@
|
||||
SHA512 (zlib-1.2.11.tar.gz) = 73fd3fff4adeccd4894084c15ddac89890cd10ef105dd5e1835e1e9bbb6a49ff229713bd197d203edfa17c2727700fce65a2a235f07568212d820dca88b528ae
|
||||
SHA512 (bzip2-1.0.8.tar.gz) = 083f5e675d73f3233c7930ebe20425a533feedeaaa9d8cc86831312a6581cefbe6ed0d08d2fa89be81082f2a5abdabca8b3c080bf97218a1bd59dc118a30b9f3
|
||||
SHA512 (xz-5.2.5.tar.bz2) = 89e25ddf72427ee9608cbf2e9dbc24d592cb67a27f44ccf7d47e4d9405774444e9cfcd02ac4bcb92064860371ed31d3cfbecd5fe063f296ead607714c0a664a1
|
||||
SHA512 (R-4.0.3.tar.gz) = 2493295f3052d077a4820c0f84ca1c37df262b8b357f62f2ea99dbfffea065861735a08fa2098421078e58e917c540e680a668546d450af734722b421669e058
|
||||
SHA512 (pcre-8.44.tar.bz2) = f26d850aab5228799e58ac8c2306fb313889332c39e29b118ef1de57677c5c90f970d68d3f475cabc64f8b982a77f04eca990ff1057f3ccf5e19bd137997c4ac
|
||||
SHA512 (curl-7.72.0.tar.bz2) = ca787b8890c485f3176b9d51b024d217d69f28c34ab84c4091a2fcbbe5f13346efd559e9bb507971aec0ecb6ec4ed5975d2722773015728b72d3f26a3574c312
|
||||
SHA512 (R-4.3.3.tar.gz) = 26291590d935ea5678771cdcaea013a6c030897eb762b0204e42b34b0f1d33aac1ec933f36caa18d2a31a057a4456bf629222e4f5679f24bc48a7a764b1aedbe
|
||||
|
22
update-submodules.sh
Executable file
22
update-submodules.sh
Executable file
@ -0,0 +1,22 @@
|
||||
#! /usr/bin/bash
|
||||
|
||||
if [ $# -eq 0 ]; then
|
||||
>&2 echo "Usage: ./update-submodules.sh R-<version>.tar.gz"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
TAR=$1
|
||||
DIR=$(tar tf $TAR | cut -d"/" -f1 | uniq)
|
||||
SPEC=$PWD/R.spec
|
||||
|
||||
tar -xf $TAR
|
||||
pushd $DIR/src/library/Recommended
|
||||
for PKG in *.tar.gz; do
|
||||
PKG="${PKG%.tar.gz}"
|
||||
PKG_NAME="${PKG%_*}"
|
||||
PKG_VERS="${PKG#*_}"
|
||||
sed -i "s/submodule $PKG_NAME.*/submodule $PKG_NAME $PKG_VERS/" $SPEC
|
||||
sed -i "s/R-$PKG_NAME-devel = .*/R-$PKG_NAME-devel = ${PKG_VERS//-/.}/" $SPEC
|
||||
done
|
||||
popd
|
||||
rm -rf $DIR
|
Loading…
Reference in New Issue
Block a user