Merge branch 'master' into epel7
This commit is contained in:
commit
2a8cdda9fe
|
@ -25,3 +25,9 @@ R-2.11.1.tar.gz
|
|||
/R-3.3.0.tar.gz
|
||||
/R-3.3.1.tar.gz
|
||||
/R-3.3.2.tar.gz
|
||||
/R-3.3.3.tar.gz
|
||||
/zlib-1.2.11.tar.gz
|
||||
/bzip2-1.0.6.tar.gz
|
||||
/xz-5.2.3.tar.bz2
|
||||
/pcre-8.40.tar.bz2
|
||||
/curl-7.53.1.tar.bz2
|
||||
|
|
|
@ -0,0 +1,571 @@
|
|||
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.
|
||||
|
90
R.spec
90
R.spec
|
@ -41,11 +41,11 @@
|
|||
%global modern 1
|
||||
%endif
|
||||
|
||||
# R really wants zlib 1.2.5, bzip2 1.0.6, xz 5.0.3, curl 7.28, and pcre 8.10+
|
||||
# R really wants zlib 1.2.5, bzip2 1.0.6, xz 5.0.3, curl 7.28, and pcre 8.10+
|
||||
# These are too new for RHEL 5/6. HACKITY HACK TIME.
|
||||
%global zlibhack 0
|
||||
|
||||
%if 0%{?rhel} == 5
|
||||
%if 0%{?rhel} == 5
|
||||
%global zlibhack 1
|
||||
%endif
|
||||
|
||||
|
@ -95,8 +95,8 @@
|
|||
%endif
|
||||
|
||||
Name: R
|
||||
Version: 3.3.2
|
||||
Release: 3%{?dist}
|
||||
Version: 3.3.3
|
||||
Release: 1%{?dist}
|
||||
Summary: A language for data analysis and graphics
|
||||
URL: http://www.r-project.org
|
||||
Source0: ftp://cran.r-project.org/pub/R/src/base/R-3/R-%{version}.tar.gz
|
||||
|
@ -117,11 +117,11 @@ Source105: https://cran.r-project.org/doc/manuals/r-release/R-ints.html
|
|||
Source106: https://cran.r-project.org/doc/FAQ/R-FAQ.html
|
||||
%endif
|
||||
%if %{zlibhack}
|
||||
%global zlibv 1.2.8
|
||||
%global zlibv 1.2.11
|
||||
%global bzipv 1.0.6
|
||||
%global xzv 5.2.2
|
||||
%global pcrev 8.38
|
||||
%global curlv 7.48.0
|
||||
%global xzv 5.2.3
|
||||
%global pcrev 8.40
|
||||
%global curlv 7.53.1
|
||||
Source1000: http://zlib.net/zlib-%{zlibv}.tar.gz
|
||||
Source1001: http://www.bzip.org/1.0.6/bzip2-%{bzipv}.tar.gz
|
||||
Source1002: http://tukaani.org/xz/xz-%{xzv}.tar.bz2
|
||||
|
@ -151,12 +151,12 @@ License: GPLv2+
|
|||
Group: Applications/Engineering
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
BuildRequires: gcc-gfortran
|
||||
BuildRequires: gcc-c++, tex(latex), texinfo-tex
|
||||
BuildRequires: gcc-c++, tex(latex), texinfo-tex
|
||||
BuildRequires: libpng-devel, libjpeg-devel, readline-devel
|
||||
BuildRequires: tcl-devel, tk-devel, ncurses-devel
|
||||
BuildRequires: pcre-devel, zlib-devel
|
||||
%if 0%{?rhel}
|
||||
# RHEL older than 6
|
||||
# RHEL older than 6
|
||||
%if 0%{?rhel} < 7
|
||||
# RHEL 5 used to use curl-devel, but it is now too old.
|
||||
#BuildRequires: curl-devel
|
||||
|
@ -222,12 +222,12 @@ Requires: R-java = %{version}-%{release}
|
|||
%endif
|
||||
|
||||
%description
|
||||
This is a metapackage that provides both core R userspace and
|
||||
This is a metapackage that provides both core R userspace and
|
||||
all R development components.
|
||||
|
||||
R is a language and environment for statistical computing and graphics.
|
||||
R is similar to the award-winning S system, which was developed at
|
||||
Bell Laboratories by John Chambers et al. It provides a wide
|
||||
R is a language and environment for statistical computing and graphics.
|
||||
R is similar to the award-winning S system, which was developed at
|
||||
Bell Laboratories by John Chambers et al. It provides a wide
|
||||
variety of statistical and graphical techniques (linear and
|
||||
nonlinear modelling, statistical tests, time series analysis,
|
||||
classification, clustering, ...).
|
||||
|
@ -260,7 +260,7 @@ Requires: openblas-Rblas
|
|||
%endif
|
||||
|
||||
# These are the submodules that R-core provides. Sometimes R modules say they
|
||||
# depend on one of these submodules rather than just R. These are provided for
|
||||
# depend on one of these submodules rather than just R. These are provided for
|
||||
# packager convenience.
|
||||
Provides: R-base = %{version}
|
||||
Provides: R-boot = 1.3.18
|
||||
|
@ -275,11 +275,11 @@ Provides: R-grid = %{version}
|
|||
Provides: R-KernSmooth = 2.23.15
|
||||
Provides: R-lattice = 0.20.34
|
||||
Provides: R-MASS = 7.3.45
|
||||
Provides: R-Matrix = 1.2.7.1
|
||||
Provides: R-Matrix = 1.2.8
|
||||
Obsoletes: R-Matrix < 0.999375-7
|
||||
Provides: R-methods = %{version}
|
||||
Provides: R-mgcv = 1.8.15
|
||||
Provides: R-nlme = 3.1.128
|
||||
Provides: R-mgcv = 1.8.17
|
||||
Provides: R-nlme = 3.1.131
|
||||
Provides: R-nnet = 7.3.12
|
||||
Provides: R-parallel = %{version}
|
||||
Provides: R-rpart = 4.1.10
|
||||
|
@ -287,7 +287,7 @@ Provides: R-spatial = 7.3.11
|
|||
Provides: R-splines = %{version}
|
||||
Provides: R-stats = %{version}
|
||||
Provides: R-stats4 = %{version}
|
||||
Provides: R-survival = 2.39.5
|
||||
Provides: R-survival = 2.40.1
|
||||
Provides: R-tcltk = %{version}
|
||||
Provides: R-tools = %{version}
|
||||
Provides: R-utils = %{version}
|
||||
|
@ -340,7 +340,7 @@ Requires: tex(cm-super-ts1.enc)
|
|||
Requires: qpdf
|
||||
%endif
|
||||
|
||||
Provides: R-Matrix-devel = 1.2.7.1
|
||||
Provides: R-Matrix-devel = 1.2.8
|
||||
Obsoletes: R-Matrix-devel < 0.999375-7
|
||||
|
||||
%if %{modern}
|
||||
|
@ -460,7 +460,7 @@ EOF
|
|||
chmod +x %{__perl_requires}
|
||||
|
||||
%build
|
||||
# If you're seeing this, I'm sorry. This is ugly.
|
||||
# If you're seeing this, I'm sorry. This is ugly.
|
||||
# But short of updating RHEL 5/6 (which isn't happening), this is the best worst way to keep R working.
|
||||
%if %{zlibhack}
|
||||
pushd zlib-%{zlibv}
|
||||
|
@ -526,13 +526,13 @@ case "%{_target_cpu}" in
|
|||
export CXX="g++ -m31"
|
||||
export F77="gfortran -m31"
|
||||
export FC="gfortran -m31"
|
||||
;;
|
||||
;;
|
||||
*)
|
||||
export CC="gcc -m32"
|
||||
export CXX="g++ -m32"
|
||||
export F77="gfortran -m32"
|
||||
export FC="gfortran -m32"
|
||||
;;
|
||||
;;
|
||||
esac
|
||||
|
||||
%if 0%{?zlibhack}
|
||||
|
@ -724,10 +724,12 @@ mv %{buildroot}%{_libdir}/R/lib/libRblas.so %{buildroot}%{_libdir}/R/lib/libRref
|
|||
%if 0%{?zlibhack}
|
||||
# Most of these tests pass. Some don't. All pieces belong to you.
|
||||
%else
|
||||
%ifnarch ppc64 ppc64le
|
||||
# Needed by tests/ok-error.R, which will smash the stack on PPC64. This is the purpose of the test.
|
||||
ulimit -s 16384
|
||||
make check
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%clean
|
||||
rm -rf ${RPM_BUILD_ROOT}
|
||||
|
@ -1168,6 +1170,24 @@ R CMD javareconf \
|
|||
%{_libdir}/libRmath.a
|
||||
|
||||
%changelog
|
||||
* Wed Mar 8 2017 Tom Callaway <spot@fedoraproject.org> - 3.3.3-1
|
||||
- update to 3.3.3
|
||||
|
||||
* Tue Feb 14 2017 Tom Callaway <spot@fedoraproject.org> - 3.3.2-8
|
||||
- disable tests on ppc64/ppc64le (no real way to debug them)
|
||||
|
||||
* Tue Feb 14 2017 Björn Esser <besser82@fedoraproject.org> - 3.3.2-7
|
||||
- Add Patch2 to fix detection of zlib
|
||||
|
||||
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.2-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||
|
||||
* Sat Jan 28 2017 Björn Esser <besser82@fedoraproject.org> - 3.3.2-5
|
||||
- Rebuilt for GCC-7
|
||||
|
||||
* Thu Jan 12 2017 Igor Gnatenko <ignatenko@redhat.com> - 3.3.2-4
|
||||
- Rebuild for readline 7.x
|
||||
|
||||
* Wed Dec 14 2016 Tom Callaway <spot@fedoraproject.org> - 3.3.2-3
|
||||
- openblas-Rblas provides libRblas.so now
|
||||
|
||||
|
@ -1563,11 +1583,11 @@ R CMD javareconf \
|
|||
- bump for new tag
|
||||
|
||||
* Tue Mar 24 2009 Tom "spot" Callaway <tcallawa@redhat.com> - 2.8.1-6
|
||||
- add profile.d scripts to set R_HOME
|
||||
- add profile.d scripts to set R_HOME
|
||||
- rpmlint cleanups
|
||||
|
||||
* Mon Mar 23 2009 Tom "spot" Callaway <tcallawa@redhat.com> - 2.8.1-5
|
||||
- add R-java and R-java-devel "dummy" packages, so that we can get java dependent R-modules
|
||||
- add R-java and R-java-devel "dummy" packages, so that we can get java dependent R-modules
|
||||
to build/install
|
||||
|
||||
* Wed Mar 4 2009 Tom "spot" Callaway <tcallawa@redhat.com> - 2.8.1-4
|
||||
|
@ -1589,7 +1609,7 @@ R CMD javareconf \
|
|||
|
||||
* Sun Oct 26 2008 Tom "spot" Callaway <tcallawa@redhat.com> 2.8.0-1
|
||||
- Update to 2.8.0
|
||||
- New subpackage layout: R-core is functional userspace, R is metapackage
|
||||
- New subpackage layout: R-core is functional userspace, R is metapackage
|
||||
requiring everything
|
||||
- Fix system bzip2 detection
|
||||
|
||||
|
@ -1616,7 +1636,7 @@ R CMD javareconf \
|
|||
- fix poorly constructed file paths in html/packages.html (bz 442727)
|
||||
|
||||
* Tue May 13 2008 Tom "spot" Callaway <tcallawa@redhat.com> 2.7.0-2
|
||||
- add patch from Martyn Plummer to avoid possible bad path hardcoding in
|
||||
- add patch from Martyn Plummer to avoid possible bad path hardcoding in
|
||||
/usr/bin/Rscript
|
||||
- properly handle ia64 case (bz 446181)
|
||||
|
||||
|
@ -1636,12 +1656,12 @@ R CMD javareconf \
|
|||
- Update indices in the right place.
|
||||
|
||||
* Mon Jan 7 2008 Tom "spot" Callaway <tcallawa@redhat.com> 2.6.1-3
|
||||
- move INSTALL back into R main package, as it is useful without the
|
||||
- move INSTALL back into R main package, as it is useful without the
|
||||
other -devel bits (e.g. installing noarch package from CRAN)
|
||||
|
||||
* Tue Dec 11 2007 Tom "spot" Callaway <tcallawa@redhat.com> 2.6.1-2
|
||||
- based on changes from Martyn Plummer <martyn.plummer@r-project.org>
|
||||
- use configure options rdocdir, rincludedir, rsharedir
|
||||
- use configure options rdocdir, rincludedir, rsharedir
|
||||
- use DESTDIR at installation
|
||||
- remove obsolete generation of packages.html
|
||||
- move header files and INSTALL R-devel package
|
||||
|
@ -1793,11 +1813,11 @@ R CMD javareconf \
|
|||
|
||||
* Tue Oct 12 2004 Martyn Plummer <plummer@iarc.fr> 0:2.0.0-0.fdr.2
|
||||
- Info support is now conditional on the macro Rinfo, which is only
|
||||
defined for Fedora 1 and 2.
|
||||
defined for Fedora 1 and 2.
|
||||
|
||||
* Thu Oct 7 2004 Martyn Plummer <plummer@iarc.fr> 0:2.0.0-0.fdr.1
|
||||
- Built R 2.0.0
|
||||
- There is no longer a BUGS file, so this is not installed as a
|
||||
- There is no longer a BUGS file, so this is not installed as a
|
||||
documentation file.
|
||||
|
||||
* Mon Aug 9 2004 Martyn Plummer <plummer@iarc.fr> 0:1.9.1-0.fdr.4
|
||||
|
@ -1834,14 +1854,14 @@ R CMD javareconf \
|
|||
* Mon May 03 2004 Martyn Plummer <plummer@iarc.fr> 0:1.9.0-0.fdr.1
|
||||
- R.spec file now has mode 644. Previously it was unreadable by other
|
||||
users and this was causing a crash building under mach.
|
||||
- Changed version number to conform to Fedora conventions.
|
||||
- Changed version number to conform to Fedora conventions.
|
||||
- Removed Provides: and Obsoletes: R-base, R-recommended, which are
|
||||
now several years old. Nobody should have a copy of R-base on a
|
||||
now several years old. Nobody should have a copy of R-base on a
|
||||
supported platform.
|
||||
- Changed buildroot to Fedora standard
|
||||
- Added Requires(post,preun): info
|
||||
- Redirect output from postinstall/uninstall scripts to /dev/null
|
||||
- Added BuildRequires tags necessary to install R with full
|
||||
- Added BuildRequires tags necessary to install R with full
|
||||
capabilities on a clean mach buildroot. Conditional buildrequires
|
||||
for tcl-devel and tk-devel which were not present on RH9 or earlier.
|
||||
|
||||
|
@ -1851,7 +1871,7 @@ R CMD javareconf \
|
|||
|
||||
* Mon Mar 15 2004 Martyn Plummer <plummer@iarc.fr>
|
||||
- No need to export optimization flags. This is done by %%configure
|
||||
- Folded info installation into %%makeinstall
|
||||
- Folded info installation into %%makeinstall
|
||||
- Check that RPM_BASE_ROOT is not set to "/" before cleaning up
|
||||
|
||||
* Tue Feb 03 2004 Martyn Plummer <plummer@iarc.fr>
|
||||
|
|
7
sources
7
sources
|
@ -1 +1,6 @@
|
|||
2437014ef40641cdc9673e89c040b7a8 R-3.3.2.tar.gz
|
||||
SHA512 (R-3.3.3.tar.gz) = bcb0d92fc0b22c13e345a2f660e3b3cc5810f6a07c8f2e37949c81308c2b8a5edc322df0394ece563888645442b6c01a3e1e7005aa60bd9beacc718200829e75
|
||||
SHA512 (zlib-1.2.11.tar.gz) = 73fd3fff4adeccd4894084c15ddac89890cd10ef105dd5e1835e1e9bbb6a49ff229713bd197d203edfa17c2727700fce65a2a235f07568212d820dca88b528ae
|
||||
SHA512 (bzip2-1.0.6.tar.gz) = 00ace5438cfa0c577e5f578d8a808613187eff5217c35164ffe044fbafdfec9e98f4192c02a7d67e01e5a5ccced630583ad1003c37697219b0f147343a3fdd12
|
||||
SHA512 (xz-5.2.3.tar.bz2) = 313af8a9eb919de1cd048482779c5ef4d8ebfad89e307f01732f77de4363db8f3cf48f4b737e02f233324d5da0ff7ddfe9a195673b84d0e29d4d456c34c78eef
|
||||
SHA512 (pcre-8.40.tar.bz2) = b4c27eafbdf33bd7a1384655b1936f4be3bc6745c072347eb26e988896c52664bd85ac42444da1be78b6e20f45b6c7e5921f5f20f5b0741b5bd3d9844e5bd4e2
|
||||
SHA512 (curl-7.53.1.tar.bz2) = c668494d0e795f34b00505ca68ab41fbb475a1bccbcac1d0bbacbbbafa40a994472e100be18a0c10f8fa21b5b9bd3f4e66c1e68ff5423b13b82d829cbaefcd52
|
||||
|
|
Loading…
Reference in New Issue