Index: head/Mk/Uses/fortran.mk =================================================================== --- head/Mk/Uses/fortran.mk (revision 417155) +++ head/Mk/Uses/fortran.mk (revision 417156) @@ -1,47 +1,42 @@ # $FreeBSD$ # # Fortran support # # Feature: fortran # Usage: USES=fortran -# Valid ARGS: gcc (default), ifort +# Valid ARGS: gcc (default) # # MAINTAINER: fortran@FreeBSD.org .if !defined(_INCLUDE_USES_FORTRAN_MK) _INCLUDE_USES_FORTRAN_MK= yes .if empty(fortran_ARGS) fortran_ARGS= gcc .endif .if ${fortran_ARGS} == gcc .include "${PORTSDIR}/Mk/bsd.default-versions.mk" _GCC_VER= ${GCC_DEFAULT:S/.//} .if ${GCC_DEFAULT} == ${LANG_GCC_IS} BUILD_DEPENDS+= gfortran${_GCC_VER}:lang/gcc RUN_DEPENDS+= gfortran${_GCC_VER}:lang/gcc .else BUILD_DEPENDS+= gfortran${_GCC_VER}:lang/gcc${_GCC_VER} RUN_DEPENDS+= gfortran${_GCC_VER}:lang/gcc${_GCC_VER} .endif USE_BINUTILS= yes F77= gfortran${_GCC_VER} FC= gfortran${_GCC_VER} FFLAGS+= -Wl,-rpath=${LOCALBASE}/lib/gcc${_GCC_VER} FCFLAGS+= -Wl,-rpath=${LOCALBASE}/lib/gcc${_GCC_VER} LDFLAGS+= -Wl,-rpath=${LOCALBASE}/lib/gcc${_GCC_VER} \ -L${LOCALBASE}/lib/gcc${_GCC_VER} -B${LOCALBASE}/bin -.elif ${fortran_ARGS} == ifort -BUILD_DEPENDS+= ${LOCALBASE}/intel_fc_80/bin/ifort:lang/ifc -RUN_DEPENDS+= ${LOCALBASE}/intel_fc_80/bin/ifort:lang/ifc -F77= ${LOCALBASE}/intel_fc_80/bin/ifort -FC= ${LOCALBASE}/intel_fc_80/bin/ifort .else IGNORE= USES=fortran: invalid arguments: ${fortran_ARGS} .endif CONFIGURE_ENV+= F77="${F77}" FC="${FC}" FFLAGS="${FFLAGS}" FCFLAGS="${FCFLAGS}" MAKE_ENV+= F77="${F77}" FC="${FC}" FFLAGS="${FFLAGS}" FCFLAGS="${FCFLAGS}" .endif Index: head/benchmarks/himenobench/Makefile =================================================================== --- head/benchmarks/himenobench/Makefile (revision 417155) +++ head/benchmarks/himenobench/Makefile (revision 417156) @@ -1,107 +1,84 @@ # Created by: NAKATA Maho # $FreeBSD$ PORTNAME= himenobench PORTVERSION= 2015.07.09 CATEGORIES= benchmarks MASTER_SITES= http://accc.riken.jp/wp-content/uploads/2015/07/ DISTFILES= himenobmtxp_xl.zip himenobmtxp_l.zip \ himenobmtxp_m.zip himenobmtxp_s.zip \ cc_himenobmtxp_xl.zip cc_himenobmtxp_l.zip \ cc_himenobmtxp_m.zip cc_himenobmtxp_s.zip \ f90_xp.zip himenobmtxpa.zip DIST_SUBDIR= himeno MAINTAINER= ports@FreeBSD.org COMMENT= Tool for measureing performance of floating point operation LICENSE= LGPL20 # (or later) EXTRACT_DEPENDS= lha:archivers/lha -USES= zip +USES= fortran zip NO_WRKSUBDIR= yes -OPTIONS_DEFINE= ICC IFC OPTIMIZED_CFLAGS +OPTIONS_DEFINE= ICC OPTIMIZED_CFLAGS OPTIONS_SUB= yes ICC_DESC= Intel C compiler support ICC_BUILD_DEPENDS= ${LOCALBASE}/intel_cc_80/bin/icc:lang/icc -IFC_DESC= Intel Fortran compiler support -IFC_USES= fortran:ifort -IFC_USES_OFF= fortran OPTIMIZED_CFLAGS_CFLAGS=${OPTFLAGS} OPTIMIZED_CFLAGS_VARS= FFLAGS+="${OPTFLAGS}" ICC= ${LOCALBASE}/intel_cc_80/bin/icc CFLAGS_ICC= -O3 -tpp7 -axN -Vaxlib -IFC= ${LOCALBASE}/intel_fc_80/bin/ifort -FFLAGS_IFC= -O3 -tpp7 -axN -Vaxlib -ipo OPTFLAGS= -O2 -ffast-math -finline-functions -fomit-frame-pointer \ -funroll-loops -fexpensive-optimizations post-extract: @${FIND} ${WRKSRC} -name "*.lzh" -type f -maxdepth 1 -exec lha \ xfpw=${WRKSRC} {} \; do-build: # cd ${WRKSRC} ; ${FC} ${FFLAGS} -o himenobmtxp_xl himenobmtxp_xl.f #Too large cd ${WRKSRC} ; ${FC} ${FFLAGS} -o himenobmtxp_l himenobmtxp_l.f cd ${WRKSRC} ; ${FC} ${FFLAGS} -o himenobmtxp_m himenobmtxp_m.f cd ${WRKSRC} ; ${FC} ${FFLAGS} -o himenobmtxp_s himenobmtxp_s.f # cd ${WRKSRC} ; ${CC} ${CFLAGS} -DELARGE -o himenobmtxps_xl himenobmtxps.c #Too large cd ${WRKSRC} ; ${CC} ${CFLAGS} -DLARGE -o himenobmtxps_l himenobmtxps.c cd ${WRKSRC} ; ${CC} ${CFLAGS} -DMIDDLE -o himenobmtxps_m himenobmtxps.c cd ${WRKSRC} ; ${CC} ${CFLAGS} -DSMALL -o himenobmtxps_s himenobmtxps.c cd ${WRKSRC} ; ${CC} ${CFLAGS} -DSSMALL -o himenobmtxps_ss himenobmtxps.c cd ${WRKSRC} ; ${CC} ${CFLAGS} -o himenobmtxpa himenobmtxpa.c - -do-build-IFC-off: cd ${WRKSRC} ; ${FC} ${FFLAGS} -o himenobmtxp himenobmtxp.f90 -do-build-IFC-on: -# cd ${WRKSRC} ; ${IFC} ${FFLAGS_IFC} -o himenobmtxp_xl.ifc himenobmtxp_xl.f #Too large - cd ${WRKSRC} ; ${IFC} ${FFLAGS_IFC} -o himenobmtxp_l.ifc himenobmtxp_l.f - cd ${WRKSRC} ; ${IFC} ${FFLAGS_IFC} -o himenobmtxp_m.ifc himenobmtxp_m.f - cd ${WRKSRC} ; ${IFC} ${FFLAGS_IFC} -o himenobmtxp_s.ifc himenobmtxp_s.f - cd ${WRKSRC} ; ${IFC} ${FFLAGS_IFC} -o himenobmtxp.ifc himenobmtxp.f90 - do-build-ICC-on: # cd ${WRKSRC} ; ${ICC} ${CFLAGS_ICC} -DELARGE -o himenobmtxps_xl.icc himenobmtxps.c #Too large cd ${WRKSRC} ; ${ICC} ${CFLAGS_ICC} -DLARGE -o himenobmtxps_l.icc himenobmtxps.c cd ${WRKSRC} ; ${ICC} ${CFLAGS_ICC} -DMIDDLE -o himenobmtxps_m.icc himenobmtxps.c cd ${WRKSRC} ; ${ICC} ${CFLAGS_ICC} -DSMALL -o himenobmtxps_s.icc himenobmtxps.c cd ${WRKSRC} ; ${ICC} ${CFLAGS_ICC} -DSSMALL -o himenobmtxps_ss.icc himenobmtxps.c cd ${WRKSRC} ; ${ICC} ${CFLAGS_ICC} -o himenobmtxpa.icc himenobmtxpa.c do-install: # ${INSTALL_PROGRAM} ${WRKSRC}/himenobmtxp_xl ${STAGEDIR}${PREFIX}/bin #Too large ${INSTALL_PROGRAM} ${WRKSRC}/himenobmtxp_l ${STAGEDIR}${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/himenobmtxp_m ${STAGEDIR}${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/himenobmtxp_s ${STAGEDIR}${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/himenobmtxpa ${STAGEDIR}${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/himenobmtxps_l ${STAGEDIR}${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/himenobmtxps_m ${STAGEDIR}${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/himenobmtxps_s ${STAGEDIR}${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/himenobmtxps_ss ${STAGEDIR}${PREFIX}/bin - -do-install-IFC-off: ${INSTALL_PROGRAM} ${WRKSRC}/himenobmtxp ${STAGEDIR}${PREFIX}/bin - -do-install-IFC-on: -# ${INSTALL_PROGRAM} ${WRKSRC}/himenobmtxp_xl.ifc ${STAGEDIR}${PREFIX}/bin #Too large - ${INSTALL_PROGRAM} ${WRKSRC}/himenobmtxp_l.ifc ${STAGEDIR}${PREFIX}/bin - ${INSTALL_PROGRAM} ${WRKSRC}/himenobmtxp_m.ifc ${STAGEDIR}${PREFIX}/bin - ${INSTALL_PROGRAM} ${WRKSRC}/himenobmtxp_s.ifc ${STAGEDIR}${PREFIX}/bin - ${INSTALL_PROGRAM} ${WRKSRC}/himenobmtxp.ifc ${STAGEDIR}${PREFIX}/bin do-install-ICC-on: # ${INSTALL_PROGRAM} ${WRKSRC}/himenobmtxps_xl.icc ${STAGEDIR}${PREFIX}/bin #Too large ${INSTALL_PROGRAM} ${WRKSRC}/himenobmtxps_l.icc ${STAGEDIR}${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/himenobmtxps_m.icc ${STAGEDIR}${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/himenobmtxps_s.icc ${STAGEDIR}${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/himenobmtxps_ss.icc ${STAGEDIR}${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/himenobmtxpa.icc ${STAGEDIR}${PREFIX}/bin .include