diff options
author | taku0 <mxxouy6x3m_github@tatapa.org> | 2014-11-29 22:01:38 +0900 |
---|---|---|
committer | Peter Simons <simons@cryp.to> | 2014-12-03 16:28:28 +0100 |
commit | 4647743ed7abddbafd700a978cc5638c87272389 (patch) | |
tree | 36c9aecfc693091246c15d97cada3368ca1773c3 /pkgs/development/r-modules/patches | |
parent | 2532844fb55d223bf8abcde6447b9cc15bbdef14 (diff) |
cran-packages: updated sources
Diffstat (limited to 'pkgs/development/r-modules/patches')
-rw-r--r-- | pkgs/development/r-modules/patches/dbarts.patch | 12 | ||||
-rw-r--r-- | pkgs/development/r-modules/patches/openssl.patch | 48 |
2 files changed, 25 insertions, 35 deletions
diff --git a/pkgs/development/r-modules/patches/dbarts.patch b/pkgs/development/r-modules/patches/dbarts.patch deleted file mode 100644 index f80f6b38929..00000000000 --- a/pkgs/development/r-modules/patches/dbarts.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru -x '*~' dbarts_orig/src/Makevars.in dbarts/src/Makevars.in ---- dbarts_orig/src/Makevars.in 2014-07-01 02:30:57.000000000 +0900 -+++ dbarts/src/Makevars.in 2014-10-25 19:25:58.910704279 +0900 -@@ -6,7 +6,7 @@ - - PKG_CPPFLAGS=-I$(INST_DIR)/include -Iinclude @PTHREAD_CFLAGS@ $(THREAD_SAFE_UNLOAD) - PKG_CPPXXFLAGS=-I$(INST_DIR)/include -Iinclude @PTHREAD_CFLAGS@ $(THREAD_SAFE_UNLOAD) --PKG_LIBS=$(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS) dbarts/libdbarts.a external/libexternal.a @PTHREAD_LIBS@ -+PKG_LIBS=dbarts/libdbarts.a external/libexternal.a $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS) @PTHREAD_LIBS@ - - .PHONY: all dbarts/libdbarts.a external/libexternal.a clean - diff --git a/pkgs/development/r-modules/patches/openssl.patch b/pkgs/development/r-modules/patches/openssl.patch index 61dc641023b..d89c30f61a1 100644 --- a/pkgs/development/r-modules/patches/openssl.patch +++ b/pkgs/development/r-modules/patches/openssl.patch @@ -1,28 +1,30 @@ diff -ru -x '*~' openssl_orig/configure openssl/configure ---- openssl_orig/configure 2014-10-18 08:14:15.000000000 +0900 -+++ openssl/configure 2014-11-03 15:05:25.122906126 +0900 -@@ -1,23 +1 @@ --# Check for include --if [ ! -e /usr/include/openssl/rand.h ] --then -- echo "openssl/rand.h not found. Make sure libssl-dev (deb) or openssl-devel (rpm) is installed." -- exit 1 --fi -- --# Not linux. Probably OSX. --if [ ! -e /sbin/ldconfig ] --then -- exit 0 +--- openssl_orig/configure 2014-11-08 02:32:33.000000000 +0900 ++++ openssl/configure 2014-11-29 20:57:19.919495325 +0900 +@@ -4,14 +4,15 @@ + # if present, hence this script is not really required. On CRAN, we use + # the $OPENSSL_INCLUDES variable; elsewhere we assume to the standard + # linux location: /usr/include/openssl. +-if [ -z "$OPENSSL_INCLUDES" ]; then +- OPENSSL_INCLUDES="/usr/include" +-else +- echo "PKG_CPPFLAGS= -I$OPENSSL_INCLUDES" >> src/Makevars -fi -- --# looks like unix --LIBFILE=$(/sbin/ldconfig -p | egrep -ohm1 " [-_a-zA-Z0-9/]*/libssl[0-9]*.so$") -- --if [ -z "$LIBFILE" ] --then -- echo "libssl.so not found. Make sure libssl-dev (deb) or openssl-devel (rpm) is installed." ++# if [ -z "$OPENSSL_INCLUDES" ]; then ++# OPENSSL_INCLUDES="/usr/include" ++# else ++# echo "PKG_CPPFLAGS= -I$OPENSSL_INCLUDES" >> src/Makevars ++# fi + +-# Verify that openssl RNG is present +-if [ ! -e $OPENSSL_INCLUDES/openssl/rand.h ]; then +- echo "File $OPENSSL_INCLUDES/rand.h not found. Make sure libssl-dev (deb) or openssl-devel (rpm) is installed." - exit 1 -fi -- --echo "PKG_LIBS= -L"$(dirname $LIBFILE)" -lssl -lcrypto" > src/Makevars ++# # Verify that openssl RNG is present ++# if [ ! -e $OPENSSL_INCLUDES/openssl/rand.h ]; then ++# echo "File $OPENSSL_INCLUDES/rand.h not found. Make sure libssl-dev (deb) or openssl-devel (rpm) is installed." ++# exit 1 ++# fi +echo "PKG_LIBS= -L"${OPENSSL_HOME}/lib" -lssl -lcrypto" > src/Makevars +\ No newline at end of file |