mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-27 05:10:36 +00:00
Code Issues Releases Activity

- After digging into the Makefile and configure for fftw3 I discovered

Browse Source 
that USE_FORTRAN was only used to determine what name mangling scheme
  it had to use to compile the shim libs for fortran, but compiling everything
  using 'C' anyway.
  With this diff, the slave ports fftw3-long-fortran, fftw3-float-fortran
  and fftw3-fortran disapear since the shims are always built, without
  necessitating the use of a USE_FORTRAN.

Approved by:	ahze (Maintainer)
This commit is contained in:
Diane Bruce 2009-08-25 20:24:09 +00:00
parent 9569ca1257
commit 0ba6a0a241
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=240324
7 changed files with 9 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
math/Makefile
View File

@ -74,10 +74,7 @@
SUBDIR += fftw-float
SUBDIR += fftw3
SUBDIR += fftw3-float
SUBDIR += fftw3-float-fortran
SUBDIR += fftw3-fortran
SUBDIR += fftw3-long
SUBDIR += fftw3-long-fortran
SUBDIR += fityk
SUBDIR += fpc-fftw
SUBDIR += fpc-numlib

15
math/fftw3-float-fortran/Makefile
View File

@ -1,15 +0,0 @@
# New ports collection makefile for: fftw3-float-fortran
# Date created: June 14, 2009
# Whom: Diane Bruce <db@FreeBSD.org>
#
# $FreeBSD$
PORTREVISION= 0
COMMENT= Fast C routines (Single Precision) with fortran shim
FFTW3_FLAVOR= float
FORTRAN_SHIM= yes
MASTERDIR= ${.CURDIR}/../../math/fftw3
.include "${MASTERDIR}/Makefile"

2
math/fftw3-float/Makefile
View File

@ -5,7 +5,7 @@
# $FreeBSD$
# $MCom: ports-experimental/math/fftw3-float/Makefile,v 1.1 2006/03/28 00:08:57 ahze Exp $
PORTREVISION= 1
PORTREVISION= 2
COMMENT= Fast C routines (Single Precision)

15
math/fftw3-fortran/Makefile
View File

@ -1,15 +0,0 @@
# New ports collection makefile for: fftw3-fortran
# Date created: June 14, 2009
# Whom: Diane Bruce <db@FreeBSD.org>
#
# $FreeBSD$
PORTREVISION= 0
COMMENT= Fast C routines (Long Double Precision) with fortran shim
FFTW3_FLAVOR= default
FORTRAN_SHIM= yes
MASTERDIR= ${.CURDIR}/../../math/fftw3
.include "${MASTERDIR}/Makefile"

15
math/fftw3-long-fortran/Makefile
View File

@ -1,15 +0,0 @@
# New ports collection makefile for: fftw3-long-fortran
# Date created: June 14, 2009
# Whom: Diane Bruce <db@FreeBSD.org>
#
# $FreeBSD$
PORTREVISION= 0
COMMENT= Fast C routines (Long Double Precision) with fortran shim
FFTW3_FLAVOR= long
FORTRAN_SHIM= yes
MASTERDIR= ${.CURDIR}/../../math/fftw3
.include "${MASTERDIR}/Makefile"

2
math/fftw3-long/Makefile
View File

@ -5,7 +5,7 @@
# $FreeBSD$
# $MCom: ports-experimental/math/fftw3-long/Makefile,v 1.1 2006/03/28 00:08:58 ahze Exp $
PORTREVISION= 0
PORTREVISION= 1
COMMENT= Fast C routines (Long Double Precision)

28
math/fftw3/Makefile
View File

@ -7,7 +7,7 @@
PORTNAME= fftw3
PORTVERSION= 3.2.2
PORTREVISION?= 0
PORTREVISION?= 1
CATEGORIES= math
MASTER_SITES= ftp://ftp.fftw.org/pub/fftw/ \
ftp://ftp.fftw.org/pub/fftw/old/
@ -40,14 +40,6 @@ INSTALL_TARGET= install-pkgconfigDATA install-libLTLIBRARIES install-exec
OPTIONS= OPTIMIZED_CFLAGS "Enable optimized CFLAGS" off
.if defined(FORTRAN_SHIM)
USE_FORTRAN= yes
CONFLICTS= fftw3-3*
.else
CONFIGURE_ARGS+= --disable-fortran
CONFLICTS= fftw3-*fortran-3*
.endif
.include <bsd.port.pre.mk>
.if defined(WITH_OPTIMIZED_CFLAGS)
@ -76,33 +68,22 @@ CONFIGURE_ENV+= CFLAGS="${CFLAGS_3DNOW}"
.if defined(FFTW3_FLAVOR)
.if ${FFTW3_FLAVOR}=="float"
FFTW3_SUFX= f
.if defined(FORTRAN_SHIM)
FFTW3_PKGNAMESUFFIX= -float-fortran
.else
FFTW3_PKGNAMESUFFIX= -float
.endif
CONFIGURE_ARGS+=--enable-float
.else
.if ${FFTW3_FLAVOR}=="long"
. if ${OSVERSION} < 800000
ONLY_FOR_ARCHS= i386 sparc64
ONLY_FOR_ARCHS= i386 sparc64
LIB_DEPENDS+= ml.0:${PORTSDIR}/math/ldouble
. endif
FFTW3_SUFX= l
.if defined(FORTRAN_SHIM)
FFTW3_PKGNAMESUFFIX= -long-fortran
.else
FFTW3_PKGNAMESUFFIX= -long
.endif
CONFIGURE_ARGS+=--enable-long-double
.endif
.endif
.endif
.if ${FFTW3_FLAVOR}=="default"
.if defined(FORTRAN_SHIM)
FFTW3_PKGNAMESUFFIX= -fortran
.endif
PLIST_SUB+= DEF=""
.else
PLIST_SUB+= DEF="@comment "
@ -132,6 +113,11 @@ post-patch:
.endif
.endif
post-configure:
@{ECHO_CMD} "#define F77_FUNC(name,NAME) name ## _" >>${WRKSRC}/config.h
@{ECHO_CMD} "#define F77_FUNC_(name,NAME) name ## _" >>${WRKSRC}/config.h
@{ECHO_CMD} "#define F77_FUNC_EQUIV 1" >>${WRKSRC}/config.h
.if defined(FFTW3_FLAVOR) && ${FFTW3_FLAVOR}!="default"
post-install:
@${INSTALL_MAN} ${WRKSRC}/tools/fftw${FFTW3_SUFX}-wisdom.1 ${PREFIX}/man/man1