pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

atlas: Attempt to reuse lapack's libraries



Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Sat Jul 9 09:24:42 2016 +0200
Changeset:	615103f00c852cbeb916c6b70e3563d03cfa2a78

Modified Files:
	atlas/Makefile
	atlas/distinfo
Added Files:
	atlas/patches/patch-CONFIG_src_config.c

Log Message:
atlas: Attempt to reuse lapack's libraries

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=615103f00c852cbeb916c6b70e3563d03cfa2a78

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 atlas/Makefile                          |  9 ++++++---
 atlas/distinfo                          |  1 +
 atlas/patches/patch-CONFIG_src_config.c | 15 +++++++++++++++
 3 files changed, 22 insertions(+), 3 deletions(-)

diffs:
diff --git a/atlas/Makefile b/atlas/Makefile
index 7d1a388..9bf0ce9 100644
--- a/atlas/Makefile
+++ b/atlas/Makefile
@@ -11,14 +11,11 @@ HOMEPAGE=	http://math-atlas.sourceforge.net/
 COMMENT=	Automatically Tuned Linear Algebra Software
 LICENSE=	modified-bsd
 
-CONFLICTS=	lapack-[0-9]*
-
 WRKSRC=		${WRKDIR}/ATLAS
 HAS_CONFIGURE=	yes
 
 MAKE_JOBS_SAFE=	no
 
-PKGSRC_FORTRAN=	gfortran
 USE_LANGUAGES=	c fortran77
 USE_TOOLS+=	gmake
 
@@ -37,6 +34,11 @@ CONFIGURE_ARGS+=	--incdir=${DESTDIR}${PREFIX}/include
 CONFIGURE_ARGS+=	--libdir=${DESTDIR}${PREFIX}/lib
 CONFIGURE_ARGS+=	-b ${ATLAS_CPUBITS}
 CONFIGURE_ARGS+=	-t ${MAKE_JOBS}
+CONFIGURE_ARGS+=	-Ss flapack ${PREFIX}/lib/liblapack.a
+
+# atlas requires distfiles from lapack
+.include "../../math/lapack/Makefile.version"
+CONFIGURE_ARGS+=	--with-netlib-lapack-tarfile=${DISTDIR}/${LAPACK_NAME}-${LAPACK_VERSION}${LAPACK_SUFX}
 
 TEST_TARGET=	check
 BUILD_TAGET=	build shared ptshared
@@ -49,4 +51,5 @@ pre-configure:
 #   find:: not found
 # Atlas iterates over all paths from PATH and executes find(1)
 
+.include "../../math/lapack/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/atlas/distinfo b/atlas/distinfo
index c45fcca..f1b8ba8 100644
--- a/atlas/distinfo
+++ b/atlas/distinfo
@@ -7,5 +7,6 @@ Size (atlas3.10.2.tar.bz2) = 4904923 bytes
 SHA1 (patch-CONFIG_src_Makefile) = fbe578eadf870863603ba5eaa33ff2e763f094e2
 SHA1 (patch-CONFIG_src_backend_Make.ext) = adde5aa439381d8a55e7c2d5fbba18aa44cd1257
 SHA1 (patch-CONFIG_src_backend_archinfo__netbsd.c) = e1644ca3b5d1610c36dfeb338afe1958e2a3268f
+SHA1 (patch-CONFIG_src_config.c) = 21f62d10b475570bbe085510e8c05c86240c0fdd
 SHA1 (patch-aa) = 1cfe4f7ad66ec006a2d6ee9186d1d91b9d656c44
 SHA1 (patch-ab) = 45a535eb378de2cfcc4cf64e5f76d0ae0fc28a0f
diff --git a/atlas/patches/patch-CONFIG_src_config.c b/atlas/patches/patch-CONFIG_src_config.c
new file mode 100644
index 0000000..41a0306
--- /dev/null
+++ b/atlas/patches/patch-CONFIG_src_config.c
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Disable CPU Throttling detection, it can lower down performance of the executable.
+
+--- CONFIG/src/config.c.orig	2014-07-10 16:22:02.000000000 +0000
++++ CONFIG/src/config.c
+@@ -711,6 +711,8 @@ int ProbePtrbits(int verb, char *targarg
+ 
+ int ProbeCPUThrottle(int verb, char *targarg, enum OSTYPE OS, enum ASMDIA asmb)
+ {
++   return 0;
++
+    int i, iret;
+    char *ln;
+    i = strlen(targarg) + 22 + 12;


Home | Main Index | Thread Index | Old Index