From d2e49c4eca3c1de3de291a73f1689f64bcdac2d0 Mon Sep 17 00:00:00 2001 From: Ying-Chieh Liao Date: Tue, 26 Mar 2002 05:49:54 +0000 Subject: [PATCH] make it be able to build on all supported archs PR: 35994 Submitted by: Li-lun Wang (Leland Wang) Approved by: maintainer --- math/atlas/Makefile | 28 ++++++++++++++++------------ math/atlas/files/answer | 9 --------- math/atlas/files/patch-aa | 14 ++++++++++++-- math/atlas/pkg-plist | 32 ++++++++++++++++---------------- 4 files changed, 44 insertions(+), 39 deletions(-) delete mode 100644 math/atlas/files/answer diff --git a/math/atlas/Makefile b/math/atlas/Makefile index 0c0edae86ec8..762e457ca65b 100644 --- a/math/atlas/Makefile +++ b/math/atlas/Makefile @@ -16,29 +16,33 @@ MAINTAINER= chat95@mbox.kyoto-inet.or.jp BUILD_DEPENDS= ${LOCALBASE}/lib/liblapack.a:${PORTSDIR}/math/lapack +IS_INTERACTIVE= yes USE_BZIP2= yes WRKSRC= ${WRKDIR}/ATLAS NO_PACKAGE= "It is better to compile at the target machine." NO_CDROM= "It is better to compile at the target machine." do-configure: - @(cd ${WRKSRC}; ${MAKE_ENV} ${MAKE} config < ${FILESDIR}/answer) + @(cd ${WRKSRC}; ${MAKE_ENV} ${MAKE} config) do-build: - (cd ${WRKSRC}; ${MAKE_ENV} ${MAKE} install arch=FreeBSD_GENERIC) + (cd ${WRKSRC}; ${MAKE_ENV} ${MAKE} install arch=`cat ${WRKSRC}/ARCHNAME`) (cd ${WRKSRC}; ${MKDIR} tmp ; \ ${CP} ${LOCALBASE}/lib/liblapack.a tmp ;\ cd tmp ;\ ar x liblapack.a ;\ - ar x ../lib/FreeBSD_GENERIC/liblapack.a ;\ - ar r ../lib/FreeBSD_GENERIC/libalapack.a *.o ;\ - ranlib ../lib/FreeBSD_GENERIC/libalapack.a ) + ar x ../lib/`cat ${WRKSRC}/ARCHNAME`/liblapack.a ;\ + ar r ../lib/`cat ${WRKSRC}/ARCHNAME`/libalapack.a *.o ;\ + ranlib ../lib/`cat ${WRKSRC}/ARCHNAME`/libalapack.a ) do-install: - @${MKDIR} ${PREFIX}/share/doc/atlas - ${INSTALL_DATA} ${WRKSRC}/lib/FreeBSD_GENERIC/libatlas.a ${PREFIX}/lib - ${INSTALL_DATA} ${WRKSRC}/lib/FreeBSD_GENERIC/libcblas.a ${PREFIX}/lib - ${INSTALL_DATA} ${WRKSRC}/lib/FreeBSD_GENERIC/libf77blas.a ${PREFIX}/lib - ${INSTALL_DATA} ${WRKSRC}/lib/FreeBSD_GENERIC/libtstatlas.a ${PREFIX}/lib - ${INSTALL_DATA} ${WRKSRC}/lib/FreeBSD_GENERIC/libalapack.a ${PREFIX}/lib - ${INSTALL_DATA} ${WRKSRC}/doc/* ${PREFIX}/share/doc/atlas + ${INSTALL_DATA} ${WRKSRC}/lib/`cat ${WRKSRC}/ARCHNAME`/libatlas.a ${PREFIX}/lib + ${INSTALL_DATA} ${WRKSRC}/lib/`cat ${WRKSRC}/ARCHNAME`/libcblas.a ${PREFIX}/lib + ${INSTALL_DATA} ${WRKSRC}/lib/`cat ${WRKSRC}/ARCHNAME`/libf77blas.a ${PREFIX}/lib + ${INSTALL_DATA} ${WRKSRC}/lib/`cat ${WRKSRC}/ARCHNAME`/libtstatlas.a ${PREFIX}/lib + ${INSTALL_DATA} ${WRKSRC}/lib/`cat ${WRKSRC}/ARCHNAME`/libalapack.a ${PREFIX}/lib +.if !defined(NOPORTDOCS) + @${MKDIR} ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/doc/* ${DOCSDIR} +.endif + .include diff --git a/math/atlas/files/answer b/math/atlas/files/answer deleted file mode 100644 index 5b40a09cbd12..000000000000 --- a/math/atlas/files/answer +++ /dev/null @@ -1,9 +0,0 @@ - - - - - -FreeBSD_GENERIC - - - diff --git a/math/atlas/files/patch-aa b/math/atlas/files/patch-aa index bded0d8411bd..08db957f65eb 100644 --- a/math/atlas/files/patch-aa +++ b/math/atlas/files/patch-aa @@ -1,5 +1,5 @@ ---- config.c.orig Sat Feb 2 11:57:44 2002 -+++ config.c Sun Mar 3 16:28:41 2002 +--- config.c.orig Sat Feb 2 10:57:44 2002 ++++ config.c Sun Mar 17 11:19:00 2002 @@ -2050,6 +2050,7 @@ if (!CmndOneLine(targ, "sysctl hw.model", ln)) { @@ -8,3 +8,13 @@ else if (strstr(ln, "Pentium III")) mach = IntPIII; else if (strstr(ln, "Pentium II ")) mach = IntPII; else if (strstr(ln, "Athlon")) mach = AmdAthlon; +@@ -3018,6 +3019,9 @@ + } + if (USEWINF77) strcpy(F77, "$(BINdir)/winf77.exe"); + ++ fpout = fopen("ARCHNAME", "w"); ++ fprintf(fpout, "%s", ARCH); ++ fclose(fpout); + ATL_mprintf(2, fplog, stdout,"\nCreating make include file Make.%s\n", ARCH); + sprintf(ln, "Make.%s", ARCH); + fpout = fopen(ln, "w"); diff --git a/math/atlas/pkg-plist b/math/atlas/pkg-plist index 2365e5553bb3..041f5b3612b1 100644 --- a/math/atlas/pkg-plist +++ b/math/atlas/pkg-plist @@ -3,19 +3,19 @@ lib/libalapack.a lib/libcblas.a lib/libf77blas.a lib/libtstatlas.a -share/doc/atlas/AtlasCredits.txt -share/doc/atlas/ChangeLog.txt -share/doc/atlas/DirStruct.txt -share/doc/atlas/INDEX.txt -share/doc/atlas/LibReadme.txt -share/doc/atlas/TestTime.txt -share/doc/atlas/TroubleShoot.txt -share/doc/atlas/Windows.txt -share/doc/atlas/atlas_contrib.ps -share/doc/atlas/atlas_devel.ps -share/doc/atlas/atlas_over.ps -share/doc/atlas/cblas.ps -share/doc/atlas/cblasqref.ps -share/doc/atlas/f77blasqref.ps -share/doc/atlas/lapackqref.ps -@dirrm share/doc/atlas +%%PORTDOCS%%share/doc/atlas/AtlasCredits.txt +%%PORTDOCS%%share/doc/atlas/ChangeLog.txt +%%PORTDOCS%%share/doc/atlas/DirStruct.txt +%%PORTDOCS%%share/doc/atlas/INDEX.txt +%%PORTDOCS%%share/doc/atlas/LibReadme.txt +%%PORTDOCS%%share/doc/atlas/TestTime.txt +%%PORTDOCS%%share/doc/atlas/TroubleShoot.txt +%%PORTDOCS%%share/doc/atlas/Windows.txt +%%PORTDOCS%%share/doc/atlas/atlas_contrib.ps +%%PORTDOCS%%share/doc/atlas/atlas_devel.ps +%%PORTDOCS%%share/doc/atlas/atlas_over.ps +%%PORTDOCS%%share/doc/atlas/cblas.ps +%%PORTDOCS%%share/doc/atlas/cblasqref.ps +%%PORTDOCS%%share/doc/atlas/f77blasqref.ps +%%PORTDOCS%%share/doc/atlas/lapackqref.ps +%%PORTDOCS%%@dirrm share/doc/atlas