Index: head/math/gotoblas/Makefile =================================================================== --- head/math/gotoblas/Makefile (revision 204741) +++ head/math/gotoblas/Makefile (revision 204742) @@ -1,119 +1,119 @@ # Ports collection makefile for: gotoblas # Date created: 20070203 # Whom: Sato Hiroki # # $FreeBSD$ # PORTNAME= gotoblas -PORTVERSION= 1.19 +PORTVERSION= 1.20 CATEGORIES= math MASTER_SITES= #empty DISTNAME= GotoBLAS-${PORTVERSION} MAINTAINER= maho@FreeBSD.org COMMENT= The fastest implementation of the Basic Linear Algebra Subroutines USE_GMAKE= yes USE_LDCONFIG= yes RESTRICTED= Redistribution not permitted WRKSRC= ${WRKDIR}/GotoBLAS PLIST_FILES= lib/libgoto.a \ lib/libgoto.so \ lib/libgoto.so.1 \ lib/libgotop.a \ lib/libgotop.so \ lib/libgotop.so.1 USE_PERL5= yes .include USE_FORTRAN= yes .if ${ARCH} == "amd64" || ${ARCH} == "alpha" || ${ARCH} == "sparc64" || ${ARCH} == "ia64" MAKE_FLAGS+= BINARY64=1 .else MAKE_FLAGS+= BINARY32=1 .endif .if defined(WITH_INTERFACE64) MAKE_FLAGS+= INTERFACE64=1 .endif .if defined(WITH_G77) MAKE_FLAGS+= F_COMPILER=GFORTRAN .elif defined(WITH_G77) MAKE_FLAGS+= F_COMPILER=G77 .elif defined(WITH_G95) MAKE_FLAGS+= F_COMPILER=G95 .elif defined(WITH_IFORT) MAKE_FLAGS+= F_COMPILER=INTEL .elif defined(WITH_PGF77) MAKE_FLAGS+= F_COMPILER=PGI .elif defined(WITH_PATHF90) MAKE_FLAGS+= F_COMPILER=PATHF90 .elif defined(WITH_XLF) MAKE_FLAGS+= F_COMPILER=IBM .endif MAKE_FLAGS_SMP= PTHREAD_LIBS="${PTHREAD_LIBS}" \ PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" pre-everything:: @${ECHO_CMD} "****" @${ECHO_CMD} "You can choose FORTRAN compiler" \ "by using the following knobs:" @${ECHO_CMD} " WITH_GFORTRAN=yes (gfortran; default)" @${ECHO_CMD} " WITH_G77=yes (g77)" @${ECHO_CMD} " WITH_G95=yes (g95)" @${ECHO_CMD} " WITH_IFORT=yes (ifort)" @${ECHO_CMD} " WITH_PGF77=yes (pgf77)" @${ECHO_CMD} " WITH_PATHF90=yes (pathf90)" @${ECHO_CMD} " WITH_XLF=yes (xlf)" @${ECHO_CMD} " WITH_INTERFACE64=yes (for using 64-bit integer interface)" @${ECHO_CMD} "- Note that if the specified compiler does not exist" \ "on your system, build will fail." @${ECHO_CMD} "- None is specified, gfortran will be used." @${ECHO_CMD} "****" .if !defined(PACKAGE_BUILDING) && !exists(${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX}) do-fetch: @${ECHO_CMD} "You need to fetch ${DISTFILES} from:" @${ECHO_CMD} "http://www.tacc.utexas.edu/resources/software/software.php" @${ECHO_CMD} "and put it to ${DISTDIR}." .endif #Honor F77 and CC, but this makes Makefile.rule bit dirtier pre-build: @${REINPLACE_CMD} -e "s+%%F77%%+${F77}+" -e "s+%%CC%%+${CC}+" ${WRKSRC}/Makefile.rule do-build: ${MKDIR} ${WRKDIR}/lib cd ${WRKSRC} && \ ${GMAKE} ${MAKE_FLAGS} cd ${WRKSRC}/exports \ && ${GMAKE} ${MAKE_FLAGS} so ${INSTALL_DATA} ${WRKSRC}/libgoto-r${PORTVERSION}.a \ ${WRKDIR}/lib/libgoto.a ${INSTALL_DATA} ${WRKSRC}/libgoto-r${PORTVERSION}.so \ ${WRKDIR}/lib/libgoto.so.1 cd ${WRKSRC} && ${GMAKE} clean cd ${WRKSRC} && \ ${GMAKE} ${MAKE_FLAGS_SMP} ${MAKE_FLAGS} SMP=1 cd ${WRKSRC}/exports && \ ${GMAKE} ${MAKE_FLAGS_SMP} ${MAKE_FLAGS} SMP=1 so ${INSTALL_DATA} ${WRKSRC}/libgotop-r${PORTVERSION}.a \ ${WRKDIR}/lib/libgotop.a ${INSTALL_DATA} ${WRKSRC}/libgotop-r${PORTVERSION}.so \ ${WRKDIR}/lib/libgotop.so.1 do-install: ${INSTALL_DATA} ${WRKDIR}/lib/libgoto.a ${PREFIX}/lib/libgoto.a ${INSTALL_DATA} ${WRKDIR}/lib/libgoto.so.1 ${PREFIX}/lib/libgoto.so.1 ${INSTALL_DATA} ${WRKDIR}/lib/libgotop.a ${PREFIX}/lib/libgotop.a ${INSTALL_DATA} ${WRKDIR}/lib/libgotop.so.1 ${PREFIX}/lib/libgotop.so.1 cd ${PREFIX}/lib && ${LN} -s -f libgoto.so.1 libgoto.so cd ${PREFIX}/lib && ${LN} -s -f libgotop.so.1 libgotop.so .include Property changes on: head/math/gotoblas/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.8 \ No newline at end of property +1.9 \ No newline at end of property Index: head/math/gotoblas/distinfo =================================================================== --- head/math/gotoblas/distinfo (revision 204741) +++ head/math/gotoblas/distinfo (revision 204742) @@ -1,3 +1,3 @@ -MD5 (GotoBLAS-1.19.tar.gz) = 3029a72f2a0377a903c24ae03ada61ba -SHA256 (GotoBLAS-1.19.tar.gz) = 68961f6e81d91c81898fa0b89c8632fc5d4f4fe60f8d0019e90b1a45d3486bdb -SIZE (GotoBLAS-1.19.tar.gz) = 1935724 +MD5 (GotoBLAS-1.20.tar.gz) = b431b88a73ba070e50eae3367e6f43f4 +SHA256 (GotoBLAS-1.20.tar.gz) = 57962a273e9950b264fae2b429f132cfac47021c97de0b1be1a3dc4838f77666 +SIZE (GotoBLAS-1.20.tar.gz) = 1927558 Property changes on: head/math/gotoblas/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.6 \ No newline at end of property +1.7 \ No newline at end of property Index: head/math/gotoblas/files/patch-Makefile.rule =================================================================== --- head/math/gotoblas/files/patch-Makefile.rule (revision 204741) +++ head/math/gotoblas/files/patch-Makefile.rule (revision 204742) @@ -1,103 +1,115 @@ --- Makefile.rule.orig 2007-09-14 00:30:23.000000000 +0900 +++ Makefile.rule 2007-09-22 06:21:56.000000000 +0900 @@ -155,11 +155,11 @@ endif ifndef F_COMPILER -F_COMPILER = G77 +F_COMPILER = GFORTRAN endif ifeq ($(C_COMPILER), GNU) -COMPILER = gcc +COMPILER = %%CC%% CCOMMON_OPT += -Wall ifneq ($(OSNAME), CYGWIN_NT) CCOMMON_OPT += -fPIC @@ -175,12 +175,12 @@ endif ifeq ($(C_COMPILER), INTEL) -COMPILER = icc +COMPILER = %%CC%% CCOMMON_OPT += -fPIC endif ifeq ($(F_COMPILER), G77) -COMPILER_F77 = g77 +COMPILER_F77 = %%F77%% BU = _ CCOMMON_OPT += -DF_INTERFACE_F2C -DNEED_F2CCONV FCOMMON_OPT += -Wall @@ -197,7 +197,7 @@ endif ifeq ($(F_COMPILER), G95) -COMPILER_F77 = g95 +COMPILER_F77 = %%F77%% BU = _ CCOMMON_OPT += -DF_INTERFACE_F2C FCOMMON_OPT += -Wall # -fno-underscoring @@ -215,11 +215,12 @@ endif ifeq ($(F_COMPILER), GFORTRAN) -COMPILER_F77 = gfortran +COMPILER_F77 = %%F77%% BU = _ CCOMMON_OPT += -DF_INTERFACE_GFORT FCOMMON_OPT += -Wall -EXTRALIB += -lgfortran +GCCPATH = $(shell dirname `%%F77%% -print-libgcc-file-name`) +EXTRALIB += -L$(GCCPATH)/../../../ -lgfortran ifneq ($(OSNAME), CYGWIN_NT) FCOMMON_OPT += -fPIC endif @@ -237,7 +238,7 @@ endif ifeq ($(F_COMPILER), INTEL) -COMPILER_F77 = ifort +COMPILER_F77 = %%F77%% BU = _ CCOMMON_OPT += -DF_INTERFACE_F2C FCOMMON_OPT += -fPIC @@ -289,11 +290,9 @@ endif endif -ifneq ($(OSNAME), CYGWIN_NT) ifdef SMP -PTHREADLIB += -lpthread -FEXTRALIB += -lpthread -endif +PTHREADLIB += ${PTHREAD_LIBS} +FEXTRALIB += ${PTHREAD_CFLAGS} endif ifeq ($(F_COMPILER), PATHSCALE) @@ -347,7 +346,7 @@ GETARCH_CC = gcc endif -ARCH := $(shell (cd $(TOPDIR); ./getarch 0 $(GETARCH_CC) $(GETARCH_FLAGS))) +GARCH := $(shell (cd $(TOPDIR); ./getarch 0 $(GETARCH_CC) $(GETARCH_FLAGS))) SUBARCH := $(shell (cd $(TOPDIR); ./getarch 1 $(GETARCH_CC) $(GETARCH_FLAGS))) ARCHSUBDIR := $(shell (cd $(TOPDIR); ./getarch 2 $(GETARCH_CC) $(GETARCH_FLAGS))) CONFIG := $(shell (cd $(TOPDIR); ./getarch 3 $(GETARCH_CC) $(GETARCH_FLAGS))) @@ -430,11 +429,11 @@ FPFLAGS = $(COMMON_OPT) $(FCOMMON_OPT) $(COMMON_PROF) ifndef SMP -LIBNAME = $(LIBPREFIX)_$(LIBSUBARCH)$(REVISION).a -LIBNAME_P = $(LIBPREFIX)_$(LIBSUBARCH)$(REVISION)_p.a +LIBNAME = $(LIBPREFIX)$(REVISION).a +LIBNAME_P = $(LIBPREFIX)$(REVISION)_p.a else -LIBNAME = $(LIBPREFIX)_$(LIBSUBARCH)p$(REVISION).a -LIBNAME_P = $(LIBPREFIX)_$(LIBSUBARCH)p$(REVISION)_p.a +LIBNAME = $(LIBPREFIX)p$(REVISION).a +LIBNAME_P = $(LIBPREFIX)p$(REVISION)_p.a endif LIBSONAME = $(LIBNAME:.a=.so) + +--- Makefile.rule~ 2007-12-31 10:14:30.000000000 +0900 ++++ Makefile.rule 2007-12-31 10:33:09.000000000 +0900 +@@ -3,7 +3,7 @@ + # + + # This library's version +-REVISION = -r1.21 ++REVISION = -r1.20 + + # Which C compiler do you prefer? Default is gcc. + # I recommend you to use GCC because inline assembler is required. Property changes on: head/math/gotoblas/files/patch-Makefile.rule ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.4 \ No newline at end of property +1.5 \ No newline at end of property