Attachment #171049 for bug #210050

View | Details | Raw Unified | Return to bug 210050
Collapse All | Expand All




# $FreeBSD: head/math/armadillo/Makefile 415754 2016-05-24 01:47:42Z danilo $

PORTNAME=	armadillo
PORTVERSION=	7.100.3
CATEGORIES=	math
MASTER_SITES=	SF/arma



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=		blaslapack cmake compiler:c++11-lang tar:xz
USE_LDCONFIG=	yes

BROKEN_powerpc64=	Does not build

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)../../home/pi/myp/math/armadillo/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1464054577	1	TIMESTAMP = 1465123703
2	SHA256 (armadillo-6.700.7.tar.gz) = 2a3388ee99d345b3e31c83ea3b0850292ac1a2154ffb785c1f03af9d3b6b7175	2	SHA256 (armadillo-7.100.3.tar.xz) = 3fa4a2f84b54d48260efd587d7e6290618bc909d191bec0a3084a890af699d1e
3	SIZE (armadillo-6.700.7.tar.gz) = 5470594	3	SIZE (armadillo-7.100.3.tar.xz) = 3715272




--- 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()




--- 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 /




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

include/armadillo_bits/xvec_htrans_bones.hpp
include/armadillo_bits/xvec_htrans_meat.hpp
lib/libarmadillo.so
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

Return to bug 210050

Lines 262-267 Link Here

(-)../../home/pi/myp/math/armadillo/pkg-plist (-2 / +21 lines)
262	include/armadillo_bits/mul_gemv.hpp	262	include/armadillo_bits/mul_gemv.hpp
263	include/armadillo_bits/mul_herk.hpp	263	include/armadillo_bits/mul_herk.hpp
264	include/armadillo_bits/mul_syrk.hpp	264	include/armadillo_bits/mul_syrk.hpp
		265	include/armadillo_bits/newarp_DenseGenMatProd_bones.hpp
		266	include/armadillo_bits/newarp_DenseGenMatProd_meat.hpp
		267	include/armadillo_bits/newarp_DoubleShiftQR_bones.hpp
		268	include/armadillo_bits/newarp_DoubleShiftQR_meat.hpp
		269	include/armadillo_bits/newarp_EigsSelect.hpp
		270	include/armadillo_bits/newarp_GenEigsSolver_bones.hpp
		271	include/armadillo_bits/newarp_GenEigsSolver_meat.hpp
		272	include/armadillo_bits/newarp_SortEigenvalue.hpp
		273	include/armadillo_bits/newarp_SparseGenMatProd_bones.hpp
		274	include/armadillo_bits/newarp_SparseGenMatProd_meat.hpp
		275	include/armadillo_bits/newarp_SymEigsSolver_bones.hpp
		276	include/armadillo_bits/newarp_SymEigsSolver_meat.hpp
		277	include/armadillo_bits/newarp_TridiagEigen_bones.hpp
		278	include/armadillo_bits/newarp_TridiagEigen_meat.hpp
		279	include/armadillo_bits/newarp_UpperHessenbergEigen_bones.hpp
		280	include/armadillo_bits/newarp_UpperHessenbergEigen_meat.hpp
		281	include/armadillo_bits/newarp_UpperHessenbergQR_bones.hpp
		282	include/armadillo_bits/newarp_UpperHessenbergQR_meat.hpp
		283	include/armadillo_bits/newarp_cx_attrib.hpp
265	include/armadillo_bits/op_all_bones.hpp	284	include/armadillo_bits/op_all_bones.hpp
266	include/armadillo_bits/op_all_meat.hpp	285	include/armadillo_bits/op_all_meat.hpp
267	include/armadillo_bits/op_any_bones.hpp	286	include/armadillo_bits/op_any_bones.hpp
Lines 454-461 Link Here
454	include/armadillo_bits/xvec_htrans_bones.hpp	473	include/armadillo_bits/xvec_htrans_bones.hpp
455	include/armadillo_bits/xvec_htrans_meat.hpp	474	include/armadillo_bits/xvec_htrans_meat.hpp
456	lib/libarmadillo.so	475	lib/libarmadillo.so
457	lib/libarmadillo.so.6	476	lib/libarmadillo.so.7
458	lib/libarmadillo.so.6.700.7	477	lib/libarmadillo.so.7.100.3
459	share/Armadillo/CMake/ArmadilloConfig.cmake	478	share/Armadillo/CMake/ArmadilloConfig.cmake
460	share/Armadillo/CMake/ArmadilloConfigVersion.cmake	479	share/Armadillo/CMake/ArmadilloConfigVersion.cmake
461	share/Armadillo/CMake/ArmadilloLibraryDepends-release.cmake	480	share/Armadillo/CMake/ArmadilloLibraryDepends-release.cmake

Lines 1-7 Link Here

(-)../../home/pi/myp/math/armadillo/Makefile (-4 / +4 lines)
1	# $FreeBSD: head/math/armadillo/Makefile 415754 2016-05-24 01:47:42Z danilo $	1	# $FreeBSD: head/math/armadillo/Makefile 415754 2016-05-24 01:47:42Z danilo $
2		2
3	PORTNAME= armadillo	3	PORTNAME= armadillo
4	PORTVERSION= 6.700.7	4	PORTVERSION= 7.100.3
5	CATEGORIES= math	5	CATEGORIES= math
6	MASTER_SITES= SF/arma	6	MASTER_SITES= SF/arma
7		7
Lines 10-23 Link Here
10		10
11	LICENSE= MPL	11	LICENSE= MPL
12		12
13	BROKEN_powerpc64= Does not build
14
15	LIB_DEPENDS= libboost_date_time.so:devel/boost-libs \	13	LIB_DEPENDS= libboost_date_time.so:devel/boost-libs \
16	libarpack.so:math/arpack \	14	libarpack.so:math/arpack \
17	libhdf5.so:science/hdf5 \	15	libhdf5.so:science/hdf5 \
18	libsuperlu.so:math/superlu	16	libsuperlu.so:math/superlu
19		17
20	USES= cmake blaslapack	18	USES= blaslapack cmake compiler:c++11-lang tar:xz
21	USE_LDCONFIG= yes	19	USE_LDCONFIG= yes
22		20
		21	BROKEN_powerpc64= Does not build
		22
23	.include <bsd.port.mk>	23	.include <bsd.port.mk>

Line 0 Link Here

(-)../../home/pi/myp/math/armadillo/files/patch-CMakeLists.txt (+21 lines)
	1	--- CMakeLists.txt.orig 2016-05-25 08:46:44 UTC
	2	+++ CMakeLists.txt
	3	@@ -368,12 +368,12 @@ if(NOT INSTALL_LIB_DIR)
	4	message(STATUS "*** Detected 64 bit system")
	5	# use "lib64" only on systems that have it (eg. Fedora, Red Hat).
	6	# if installing in /usr/local/, the use of lib64 might be unreliable on systems which have /usr/local/lib64 but don't use it
	7	- if(IS_DIRECTORY "${CMAKE_INSTALL_PREFIX}/lib64")
	8	- unset(INSTALL_LIB_DIR)
	9	- set(INSTALL_LIB_DIR "lib64")
	10	- message(STATUS "*** ${CMAKE_INSTALL_PREFIX}/lib64/ exists, so destination directory for the run-time library changed to ${CMAKE_INSTALL_PREFIX}/lib64/")
	11	- message(STATUS "*** Your system and/or compiler must search ${CMAKE_INSTALL_PREFIX}/lib64/ during linking")
	12	- endif()
	13	+# if(IS_DIRECTORY "${CMAKE_INSTALL_PREFIX}/lib64")
	14	+# unset(INSTALL_LIB_DIR)
	15	+# set(INSTALL_LIB_DIR "lib64")
	16	+# message(STATUS "*** ${CMAKE_INSTALL_PREFIX}/lib64/ exists, so destination directory for the run-time library changed to ${CMAKE_INSTALL_PREFIX}/lib64/")
	17	+# message(STATUS "*** Your system and/or compiler must search ${CMAKE_INSTALL_PREFIX}/lib64/ during linking")
	18	+# endif()
	19	endif()
	20	endif()
	21	endif()

Lines 1-27 Link Here

(-)../../home/pi/myp/math/armadillo/files/patch-include+armadillo_bits+config.hpp (-27 lines)
1	--- include/armadillo_bits/config.hpp.orig 2015-04-10 05:54:47 UTC
2	+++ include/armadillo_bits/config.hpp
3	@@ -24,13 +24,13 @@
4	#endif
5
6	#if !defined(ARMA_USE_ARPACK)
7	-// #define ARMA_USE_ARPACK
8	+#define ARMA_USE_ARPACK
9	//// Uncomment the above line if you have ARPACK or a high-speed replacement for ARPACK.
10	//// ARPACK is required for eigendecompositions of sparse matrices, eg. eigs_sym(), svds()
11	#endif
12
13	#if !defined(ARMA_USE_SUPERLU)
14	-// #define ARMA_USE_SUPERLU
15	+#define ARMA_USE_SUPERLU
16	//// Uncomment the above line if you have SuperLU.
17	//// SuperLU is used for solving sparse linear systems via spsolve()
18	//// Caveat: only SuperLU version 4.3 can be used!
19	@@ -68,7 +68,7 @@
20	//// Uncomment the above line if you want to use Intel MKL mkl_malloc() and mkl_free() instead of standard malloc() and free()
21
22	// #define ARMA_USE_ATLAS
23	-// #define ARMA_ATLAS_INCLUDE_DIR /usr/include/
24	+// #define ARMA_ATLAS_INCLUDE_DIR /usr/local/include/
25	//// If you're using ATLAS and the compiler can't find cblas.h and/or clapack.h
26	//// uncomment the above define and specify the appropriate include directory.
27	//// Make sure the directory has a trailing /