diff options
| author | Michael Johnson <ahze@FreeBSD.org> | 2005-11-30 19:28:01 +0000 |
|---|---|---|
| committer | Michael Johnson <ahze@FreeBSD.org> | 2005-11-30 19:28:01 +0000 |
| commit | 44960c7e7a3ca26b66f00bf44f4f7cf064001583 (patch) | |
| tree | 5c24cc358c0013ff131055ef24032df4513c13e5 /math/fftw3 | |
| parent | Update to 2.2.6 (diff) | |
- Always build the seprate fftw3 threads lib.
Requested by: Xride via irc.freenode.org/#FreeBSD-GNOME
Notes
Notes:
svn path=/head/; revision=150077
Diffstat (limited to 'math/fftw3')
| -rw-r--r-- | math/fftw3/Makefile | 14 | ||||
| -rw-r--r-- | math/fftw3/pkg-plist | 6 |
2 files changed, 6 insertions, 14 deletions
diff --git a/math/fftw3/Makefile b/math/fftw3/Makefile index fa18c0a9a18b..788c7e90f25f 100644 --- a/math/fftw3/Makefile +++ b/math/fftw3/Makefile @@ -7,7 +7,7 @@ PORTNAME= fftw3 PORTVERSION= 3.0.1 -PORTREVISION?= 4 +PORTREVISION?= 5 CATEGORIES= math MASTER_SITES= ftp://ftp.fftw.org/pub/fftw/ \ http://www.fftw.org/ @@ -29,7 +29,7 @@ USE_PERL5_BUILD=yes INSTALLS_SHLIB= yes USE_LDOUBLE= yes -CONFIGURE_ARGS= --enable-shared +CONFIGURE_ARGS= --enable-shared --enable-threads CONFIGURE_ENV= CPPLAGS="${PTHREAD_CFLAGS}" \ LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" @@ -41,8 +41,7 @@ MAN1= fftw${FFTW3_SUFX}-wisdom.1 INSTALL_TARGET= install-pkgconfigDATA install-libLTLIBRARIES install-exec .endif -OPTIONS= OPTIMIZED_CFLAGS "Enable optimized CFLAGS" off \ - SMP_THREADS "Enable FFTW SMP threads library" off +OPTIONS= OPTIMIZED_CFLAGS "Enable optimized CFLAGS" off .include <bsd.port.pre.mk> @@ -73,13 +72,6 @@ CONFIGURE_ENV+= CFLAGS="${CFLAGS_3DNOW}" .endif .endif # end WITH_OPTIMIZED_CFLAGS -.if defined(WITH_SMP_THREADS) -CONFIGURE_ARGS+=--enable-threads -PLIST_SUB+= THREADS="" -.else -PLIST_SUB+= THREADS="@comment " -.endif - .if defined(FFTW3_FLAVOR) .if ${FFTW3_FLAVOR}=="float" FFTW3_SUFX= f diff --git a/math/fftw3/pkg-plist b/math/fftw3/pkg-plist index 66dab6394e8c..1ae67d67e933 100644 --- a/math/fftw3/pkg-plist +++ b/math/fftw3/pkg-plist @@ -5,7 +5,7 @@ bin/fftw%%FFTW3_SUFX%%-wisdom lib/libfftw3%%FFTW3_SUFX%%.a lib/libfftw3%%FFTW3_SUFX%%.so lib/libfftw3%%FFTW3_SUFX%%.so.3 -%%THREADS%%lib/libfftw3%%FFTW3_SUFX%%_threads.a -%%THREADS%%lib/libfftw3%%FFTW3_SUFX%%_threads.so -%%THREADS%%lib/libfftw3%%FFTW3_SUFX%%_threads.so.3 +lib/libfftw3%%FFTW3_SUFX%%_threads.a +lib/libfftw3%%FFTW3_SUFX%%_threads.so +lib/libfftw3%%FFTW3_SUFX%%_threads.so.3 libdata/pkgconfig/fftw3%%FFTW3_SUFX%%.pc |