Attachment 171049 Details for Bug 210050 – patch

[patch] patch

arma.diff (text/plain), 6.32 KB, created by Kurt Jaeger on 2016-06-05 13:38:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kurt Jaeger

Created: 2016-06-05 13:38:17 UTC

Size: 6.32 KB

patch

obsolete

>diff -r -u -N math/armadillo/Makefile ../../home/pi/myp/math/armadillo/Makefile
>--- math/armadillo/Makefile	2016-05-24 07:42:25.640125000 +0200
>+++ ../../home/pi/myp/math/armadillo/Makefile	2016-06-05 15:36:59.856867000 +0200
>@@ -1,7 +1,7 @@
> # $FreeBSD: head/math/armadillo/Makefile 415754 2016-05-24 01:47:42Z danilo $
> 
> PORTNAME=	armadillo
>-PORTVERSION=	6.700.7
>+PORTVERSION=	7.100.3
> CATEGORIES=	math
> MASTER_SITES=	SF/arma
> 
>@@ -10,14 +10,14 @@
> 
> LICENSE=	MPL
> 
>-BROKEN_powerpc64=	Does not build
>-
> LIB_DEPENDS=	libboost_date_time.so:devel/boost-libs \
> 		libarpack.so:math/arpack \
> 		libhdf5.so:science/hdf5 \
> 		libsuperlu.so:math/superlu
> 
>-USES=		cmake blaslapack
>+USES=		blaslapack cmake compiler:c++11-lang tar:xz
> USE_LDCONFIG=	yes
> 
>+BROKEN_powerpc64=	Does not build
>+
> .include <bsd.port.mk>
>diff -r -u -N math/armadillo/distinfo ../../home/pi/myp/math/armadillo/distinfo
>--- math/armadillo/distinfo	2016-05-24 07:42:25.641258000 +0200
>+++ ../../home/pi/myp/math/armadillo/distinfo	2016-06-05 12:48:23.740045000 +0200
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1464054577
>-SHA256 (armadillo-6.700.7.tar.gz) = 2a3388ee99d345b3e31c83ea3b0850292ac1a2154ffb785c1f03af9d3b6b7175
>-SIZE (armadillo-6.700.7.tar.gz) = 5470594
>+TIMESTAMP = 1465123703
>+SHA256 (armadillo-7.100.3.tar.xz) = 3fa4a2f84b54d48260efd587d7e6290618bc909d191bec0a3084a890af699d1e
>+SIZE (armadillo-7.100.3.tar.xz) = 3715272
>diff -r -u -N math/armadillo/files/patch-CMakeLists.txt ../../home/pi/myp/math/armadillo/files/patch-CMakeLists.txt
>--- math/armadillo/files/patch-CMakeLists.txt	1970-01-01 01:00:00.000000000 +0100
>+++ ../../home/pi/myp/math/armadillo/files/patch-CMakeLists.txt	2016-06-05 15:36:45.368604000 +0200
>@@ -0,0 +1,21 @@
>+--- CMakeLists.txt.orig	2016-05-25 08:46:44 UTC
>++++ CMakeLists.txt
>+@@ -368,12 +368,12 @@ if(NOT INSTALL_LIB_DIR)
>+       message(STATUS "*** Detected 64 bit system")
>+       # use "lib64" only on systems that have it (eg. Fedora, Red Hat).
>+       # if installing in /usr/local/, the use of lib64 might be unreliable on systems which have /usr/local/lib64 but don't use it
>+-      if(IS_DIRECTORY "${CMAKE_INSTALL_PREFIX}/lib64")
>+-        unset(INSTALL_LIB_DIR)
>+-        set(INSTALL_LIB_DIR "lib64")
>+-        message(STATUS "*** ${CMAKE_INSTALL_PREFIX}/lib64/ exists, so destination directory for the run-time library changed to ${CMAKE_INSTALL_PREFIX}/lib64/")
>+-        message(STATUS "*** Your system and/or compiler must search ${CMAKE_INSTALL_PREFIX}/lib64/ during linking")
>+-      endif()
>++#      if(IS_DIRECTORY "${CMAKE_INSTALL_PREFIX}/lib64")
>++#        unset(INSTALL_LIB_DIR)
>++#        set(INSTALL_LIB_DIR "lib64")
>++#        message(STATUS "*** ${CMAKE_INSTALL_PREFIX}/lib64/ exists, so destination directory for the run-time library changed to ${CMAKE_INSTALL_PREFIX}/lib64/")
>++#        message(STATUS "*** Your system and/or compiler must search ${CMAKE_INSTALL_PREFIX}/lib64/ during linking")
>++#      endif()
>+     endif()
>+   endif()
>+ endif()
>diff -r -u -N math/armadillo/files/patch-include+armadillo_bits+config.hpp ../../home/pi/myp/math/armadillo/files/patch-include+armadillo_bits+config.hpp
>--- math/armadillo/files/patch-include+armadillo_bits+config.hpp	2015-08-01 00:51:52.549700000 +0200
>+++ ../../home/pi/myp/math/armadillo/files/patch-include+armadillo_bits+config.hpp	1970-01-01 01:00:00.000000000 +0100
>@@ -1,27 +0,0 @@
>---- include/armadillo_bits/config.hpp.orig	2015-04-10 05:54:47 UTC
>-+++ include/armadillo_bits/config.hpp
>-@@ -24,13 +24,13 @@
>- #endif
>- 
>- #if !defined(ARMA_USE_ARPACK)
>--// #define ARMA_USE_ARPACK
>-+#define ARMA_USE_ARPACK
>- //// Uncomment the above line if you have ARPACK or a high-speed replacement for ARPACK.
>- //// ARPACK is required for eigendecompositions of sparse matrices, eg. eigs_sym(), svds() 
>- #endif
>- 
>- #if !defined(ARMA_USE_SUPERLU)
>--// #define ARMA_USE_SUPERLU
>-+#define ARMA_USE_SUPERLU
>- //// Uncomment the above line if you have SuperLU.
>- //// SuperLU is used for solving sparse linear systems via spsolve()
>- //// Caveat: only SuperLU version 4.3 can be used!
>-@@ -68,7 +68,7 @@
>- //// Uncomment the above line if you want to use Intel MKL mkl_malloc() and mkl_free() instead of standard malloc() and free()
>- 
>- // #define ARMA_USE_ATLAS
>--// #define ARMA_ATLAS_INCLUDE_DIR /usr/include/
>-+// #define ARMA_ATLAS_INCLUDE_DIR /usr/local/include/
>- //// If you're using ATLAS and the compiler can't find cblas.h and/or clapack.h
>- //// uncomment the above define and specify the appropriate include directory.
>- //// Make sure the directory has a trailing /
>diff -r -u -N math/armadillo/pkg-plist ../../home/pi/myp/math/armadillo/pkg-plist
>--- math/armadillo/pkg-plist	2016-05-24 07:42:25.642498000 +0200
>+++ ../../home/pi/myp/math/armadillo/pkg-plist	2016-06-05 12:50:33.821152000 +0200
>@@ -262,6 +262,25 @@
> include/armadillo_bits/mul_gemv.hpp
> include/armadillo_bits/mul_herk.hpp
> include/armadillo_bits/mul_syrk.hpp
>+include/armadillo_bits/newarp_DenseGenMatProd_bones.hpp
>+include/armadillo_bits/newarp_DenseGenMatProd_meat.hpp
>+include/armadillo_bits/newarp_DoubleShiftQR_bones.hpp
>+include/armadillo_bits/newarp_DoubleShiftQR_meat.hpp
>+include/armadillo_bits/newarp_EigsSelect.hpp
>+include/armadillo_bits/newarp_GenEigsSolver_bones.hpp
>+include/armadillo_bits/newarp_GenEigsSolver_meat.hpp
>+include/armadillo_bits/newarp_SortEigenvalue.hpp
>+include/armadillo_bits/newarp_SparseGenMatProd_bones.hpp
>+include/armadillo_bits/newarp_SparseGenMatProd_meat.hpp
>+include/armadillo_bits/newarp_SymEigsSolver_bones.hpp
>+include/armadillo_bits/newarp_SymEigsSolver_meat.hpp
>+include/armadillo_bits/newarp_TridiagEigen_bones.hpp
>+include/armadillo_bits/newarp_TridiagEigen_meat.hpp
>+include/armadillo_bits/newarp_UpperHessenbergEigen_bones.hpp
>+include/armadillo_bits/newarp_UpperHessenbergEigen_meat.hpp
>+include/armadillo_bits/newarp_UpperHessenbergQR_bones.hpp
>+include/armadillo_bits/newarp_UpperHessenbergQR_meat.hpp
>+include/armadillo_bits/newarp_cx_attrib.hpp
> include/armadillo_bits/op_all_bones.hpp
> include/armadillo_bits/op_all_meat.hpp
> include/armadillo_bits/op_any_bones.hpp
>@@ -454,8 +473,8 @@
> include/armadillo_bits/xvec_htrans_bones.hpp
> include/armadillo_bits/xvec_htrans_meat.hpp
> lib/libarmadillo.so
>-lib/libarmadillo.so.6
>-lib/libarmadillo.so.6.700.7
>+lib/libarmadillo.so.7
>+lib/libarmadillo.so.7.100.3
> share/Armadillo/CMake/ArmadilloConfig.cmake
> share/Armadillo/CMake/ArmadilloConfigVersion.cmake
> share/Armadillo/CMake/ArmadilloLibraryDepends-release.cmake

Actions: View | Diff

Attachments on bug 210050: 171049