pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
altas: Make it building
Module Name: pkgsrc-wip
Committed By: Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By: kamil
Date: Tue Jul 5 00:38:42 2016 +0200
Changeset: 2dd395db7f931675c549e5743aea74c8456a96ba
Modified Files:
atlas/Makefile
atlas/distinfo
atlas/patches/patch-CONFIG_src_Makefile
atlas/patches/patch-CONFIG_src_backend_Make.ext
atlas/patches/patch-CONFIG_src_backend_archinfo__netbsd.c
Log Message:
altas: Make it building
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=2dd395db7f931675c549e5743aea74c8456a96ba
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
atlas/Makefile | 18 +++++++++++++++++-
atlas/distinfo | 6 +++---
atlas/patches/patch-CONFIG_src_Makefile | 2 +-
atlas/patches/patch-CONFIG_src_backend_Make.ext | 9 +++++++++
.../patch-CONFIG_src_backend_archinfo__netbsd.c | 2 +-
5 files changed, 31 insertions(+), 6 deletions(-)
diffs:
diff --git a/atlas/Makefile b/atlas/Makefile
index 5f2c16f..1190ff9 100644
--- a/atlas/Makefile
+++ b/atlas/Makefile
@@ -21,11 +21,22 @@ PKGSRC_FORTRAN= gfortran
USE_LANGUAGES= c fortran77
USE_TOOLS+= gmake
+.include "../../mk/bsd.prefs.mk"
+
+ATLAS_CPUBITS= 32
+.for P in ${LP64PLATFORMS}
+.warning hello
+.if ${MACHINE_PLATFORM:M${P}}
+.warning MAM!
+ATLAS_CPUBITS= 64
+.endif
+.endfor
+
CONFIGURE_DIRS= obj
CONFIGURE_SCRIPT= ../configure
CONFIGURE_ARGS+= --incdir=${DESTDIR}${PREFIX}/include
CONFIGURE_ARGS+= --libdir=${DESTDIR}${PREFIX}/lib
-CONFIGURE_ARGS+= -b 32
+CONFIGURE_ARGS+= -b ${ATLAS_CPUBITS}
CONFIGURE_ARGS+= -t ${MAKE_JOBS}
TEST_TARGET= check
@@ -34,4 +45,9 @@ BUILD_TAGET= build shared ptshared
pre-configure:
${RUN} cd ${WRKSRC}; mkdir ${CONFIGURE_DIRS}
+# Ignore messages from ./xprobe_comp like:
+# cd /tmp/pkgsrc-tmp/wip/atlas/work/ATLAS/obj ; ./xprobe_comp -v 0 -o atlconf.txt -O 13 -A 27 -Si nof77 0 -V 480 -b 32 -d b /tmp/pkgsrc-tmp/wip/atlas/work/ATLAS/obj > config1.out
+# find:: not found
+# Atlas iterates over all paths from PATH and executes find(1)
+
.include "../../mk/bsd.pkg.mk"
diff --git a/atlas/distinfo b/atlas/distinfo
index 5dd1afd..ac29762 100644
--- a/atlas/distinfo
+++ b/atlas/distinfo
@@ -4,8 +4,8 @@ SHA1 (atlas3.10.2.tar.bz2) = f1f883e201d70ff60d54a2af016b4afc83a2499b
RMD160 (atlas3.10.2.tar.bz2) = af4099e8bb65f5d771618ca1580f5bc8210f83fe
SHA512 (atlas3.10.2.tar.bz2) = 9fe04cfa1f89449db047d1a4659a656964d13117c783cbbe43344eb32555736f037d9cd30c5ae1514c08ad5b8949a3982d7fe102d707ddb62288e76b2607fbb1
Size (atlas3.10.2.tar.bz2) = 4904923 bytes
-SHA1 (patch-CONFIG_src_Makefile) = b62d96b61d6bd16c9a214076e9260f4f6064e04a
-SHA1 (patch-CONFIG_src_backend_Make.ext) = 9b3140112d4db1646446f564a9efb1d6a72ea457
-SHA1 (patch-CONFIG_src_backend_archinfo__netbsd.c) = f611ef725eb8e6ff1c8fe24c15f2d2d3d25c2cbc
+SHA1 (patch-CONFIG_src_Makefile) = e2b267b821d3e39fa9aa72e96e9fead8ffd00b11
+SHA1 (patch-CONFIG_src_backend_Make.ext) = c43e912712f83f102800d3e7811c398786bc5326
+SHA1 (patch-CONFIG_src_backend_archinfo__netbsd.c) = 29026d2ddcd2414598f72b1bb4b540983cf4ed18
SHA1 (patch-aa) = 1cfe4f7ad66ec006a2d6ee9186d1d91b9d656c44
SHA1 (patch-ab) = 45a535eb378de2cfcc4cf64e5f76d0ae0fc28a0f
diff --git a/atlas/patches/patch-CONFIG_src_Makefile b/atlas/patches/patch-CONFIG_src_Makefile
index f0cbef9..e5a1cc7 100644
--- a/atlas/patches/patch-CONFIG_src_Makefile
+++ b/atlas/patches/patch-CONFIG_src_Makefile
@@ -6,7 +6,7 @@ $NetBSD$
$(MAKE) $(atlrun) atldir=$(mydir) exe=xarchinfo_freebsd args="$(args)" \
redir=config0.out
- cat config0.out
-+IRunArchInfo_freebsd: xarchinfo_netbsd
++IRunArchInfo_netbsd: xarchinfo_netbsd
+ - rm -f config0.out
+ $(MAKE) $(atlrun) atldir=$(mydir) exe=xarchinfo_netbsd args="$(args)" \
+ redir=config0.out
diff --git a/atlas/patches/patch-CONFIG_src_backend_Make.ext b/atlas/patches/patch-CONFIG_src_backend_Make.ext
index a58448e..169d7f3 100644
--- a/atlas/patches/patch-CONFIG_src_backend_Make.ext
+++ b/atlas/patches/patch-CONFIG_src_backend_Make.ext
@@ -2,6 +2,15 @@ $NetBSD$
--- CONFIG/src/backend/Make.ext.orig 2014-07-10 16:22:02.000000000 +0000
+++ CONFIG/src/backend/Make.ext
+@@ -23,7 +23,7 @@ basf = $(basdRCW)/atlconf.base
+ basA = $(basdRCW)/atlarch.base
+
+
+-files = archinfo_aix.c archinfo_freebsd.c archinfo_irix.c archinfo_linux.c \
++files = archinfo_aix.c archinfo_freebsd.c archinfo_netbsd.c archinfo_irix.c archinfo_linux.c \
+ archinfo_sfu.c archinfo_sunos.c archinfo_win.c archinfo_x86.c \
+ c2cmaster.c c2cslave.c comptestC.c comptestF.f cpuid.S f2cintC.c \
+ f2cintF.f f2cnameC.c f2cnameF.f f2cstrC.c f2cstrF.f flibchkC.c \
@@ -137,6 +137,8 @@ archinfo_linux.c : $(basA)
$(extC) -b $(basA) -o archinfo_linux.c rout=archinfo_linux
archinfo_freebsd.c : $(basA)
diff --git a/atlas/patches/patch-CONFIG_src_backend_archinfo__netbsd.c b/atlas/patches/patch-CONFIG_src_backend_archinfo__netbsd.c
index 312e1f0..7a440b6 100644
--- a/atlas/patches/patch-CONFIG_src_backend_archinfo__netbsd.c
+++ b/atlas/patches/patch-CONFIG_src_backend_archinfo__netbsd.c
@@ -1,6 +1,6 @@
$NetBSD$
---- CONFIG/src/backend/archinfo_netbsd.c.orig 2016-07-04 21:48:40.614798806 +0000
+--- CONFIG/src/backend/archinfo_netbsd.c.orig 2016-07-04 21:52:43.983232504 +0000
+++ CONFIG/src/backend/archinfo_netbsd.c
@@ -0,0 +1,279 @@
+#include "atlconf.h"
Home |
Main Index |
Thread Index |
Old Index