From a1553c81108205fc8bb818f925b301a28423ee4b Mon Sep 17 00:00:00 2001 From: Tijl Coosemans Date: Wed, 5 Mar 2014 17:27:27 +0000 Subject: [PATCH] - Add USES=libtool to fix linker problem on FreeBSD/i386 8.x and FreeBSD/ia64. - Remove patch-configure.in (not needed) and remove USE_AUTOTOOLS. - Add OPTIONS_EXCLUDE=DOCS to math/fftw-float slave port. - Simplify Makefile a little. PR: ports/187274 --- math/fftw-float/Makefile | 3 +- math/fftw/Makefile | 24 ++-- math/fftw/files/patch-configure.in | 175 ----------------------------- math/fftw/pkg-plist | 6 +- 4 files changed, 13 insertions(+), 195 deletions(-) delete mode 100644 math/fftw/files/patch-configure.in diff --git a/math/fftw-float/Makefile b/math/fftw-float/Makefile index c0049a967771..88288d9da003 100644 --- a/math/fftw-float/Makefile +++ b/math/fftw-float/Makefile @@ -1,11 +1,10 @@ # Created by: Michael Johnson # $FreeBSD$ -PORTREVISION= 3 - COMMENT= Fast C routines (Single Percision) FFTW_FLAVOR= float MASTERDIR= ${.CURDIR}/../../math/fftw +OPTIONS_EXCLUDE=DOCS .include "${MASTERDIR}/Makefile" diff --git a/math/fftw/Makefile b/math/fftw/Makefile index 289bbd94be10..1eabbeaaa7d1 100644 --- a/math/fftw/Makefile +++ b/math/fftw/Makefile @@ -3,13 +3,12 @@ PORTNAME= fftw PORTVERSION= 2.1.5 -PORTREVISION?= 7 +PORTREVISION?= 8 CATEGORIES= math MASTER_SITES= ftp://ftp.fftw.org/pub/fftw/ \ ftp://ftp.fftw.org/pub/fftw/old/ \ ftp://theory.lcs.mit.edu/pub/fftw/ \ ftp://pm.cse.rmit.edu.au/pub/dsp/fftw/ -PKGNAMESUFFIX= ${FFTW_PKGNAMESUFFIX} MAINTAINER= ports@FreeBSD.org COMMENT?= Fast C routines to compute the Discrete Fourier Transform @@ -20,16 +19,14 @@ OPTIONS_DEFINE= DOCS # current flavors: default, float FFTW_FLAVOR?= default -FFTW_SUFIX= -USES= fortran gmake -USE_AUTOTOOLS= aclocal automake autoconf libtool -ACLOCAL_ARGS= -I ${LOCALBASE}/share/aclocal -AUTOMAKE_ARGS= --add-missing -CONFIGURE_ENV= MAKEINFO="makeinfo --no-split" +GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-shared +USES= fortran gmake libtool USE_LDCONFIG= yes +BROKEN_sparc64= does not build + PLIST_SUB= FFTW_SUFX="${FFTW_SUFX}" PORTSCOUT= limit:^2\. @@ -37,11 +34,10 @@ PORTSCOUT= limit:^2\. .if ${FFTW_FLAVOR}=="float" CONFIGURE_ARGS+= --enable-float --enable-type-prefix FFTW_SUFX= s -FFTW_PKGNAMESUFFIX= -float -PLIST_SUB+= DEF="@comment " +PKGNAMESUFFIX= -float .else +FFTW_SUFIX= INFO= fftw -PLIST_SUB+= DEF="" .endif .include @@ -50,12 +46,8 @@ PLIST_SUB+= DEF="" CONFIGURE_ARGS+= --enable-i386-hacks .endif -.if ${ARCH} == "sparc64" -BROKEN= does not build -.endif - post-patch: - @${REINPLACE_CMD} -e '/^SUBDIRS/s|doc | |' ${WRKSRC}/Makefile.am + @${REINPLACE_CMD} -e '/^SUBDIRS/s|doc | |' ${WRKSRC}/Makefile.in post-build: .if ${FFTW_FLAVOR}=="default" diff --git a/math/fftw/files/patch-configure.in b/math/fftw/files/patch-configure.in deleted file mode 100644 index 32d3bcfc37db..000000000000 --- a/math/fftw/files/patch-configure.in +++ /dev/null @@ -1,175 +0,0 @@ ---- configure.in.orig 2003-03-24 16:01:13.000000000 +0900 -+++ configure.in 2012-03-12 23:00:58.000000000 +0900 -@@ -23,11 +23,13 @@ - AC_ARG_WITH(gcc, [ --with-gcc use gcc instead of the native compiler cc], ok=$withval, ok=no) - if test "$ok" = "yes"; then - CC=gcc -+else -+ CC=$withval - fi - - AC_ARG_ENABLE(float, [ --enable-float compile fftw for single precision], enable_float=$enableval, enable_float=no) - if test "$enable_float" = "yes"; then -- AC_DEFINE(FFTW_ENABLE_FLOAT) -+ AC_DEFINE([FFTW_ENABLE_FLOAT],[],[desc]) - fi - - FFTW_PREFIX="" -@@ -56,27 +58,27 @@ - - AC_ARG_ENABLE(i386-hacks, [ --enable-i386-hacks enable gcc/x86 specific performance hacks], ok=$enableval, ok=no) - if test "$ok" = "yes"; then -- AC_DEFINE(FFTW_ENABLE_I386_HACKS) -+ AC_DEFINE([FFTW_ENABLE_I386_HACKS],[],[desc]) - fi - - AC_ARG_ENABLE(pentium-timer, [ --enable-pentium-timer enable high resolution Pentium timer], ok=$enableval, ok=no) - if test "$ok" = "yes"; then -- AC_DEFINE(FFTW_ENABLE_PENTIUM_TIMER) -+ AC_DEFINE([FFTW_ENABLE_PENTIUM_TIMER],[],[desc]) - fi - - AC_ARG_ENABLE(debug, [ --enable-debug compile fftw with extra runtime checks for debugging], ok=$enableval, ok=no) - if test "$ok" = "yes"; then -- AC_DEFINE(FFTW_DEBUG) -+ AC_DEFINE([FFTW_DEBUG],[],[desc]) - fi - - AC_ARG_ENABLE(debug-alignment, [ --enable-debug-alignment enable runtime checks for alignment on x86], ok=$enableval, ok=no) - if test "$ok" = "yes"; then -- AC_DEFINE(FFTW_DEBUG_ALIGNMENT) -+ AC_DEFINE([FFTW_DEBUG_ALIGNMENT],[],[desc]) - fi - - AC_ARG_ENABLE(vec-recurse, [ --enable-vec-recurse enable experimental performance hack], ok=$enableval, ok=no) - if test "$ok" = "yes"; then -- AC_DEFINE(FFTW_ENABLE_VECTOR_RECURSE) -+ AC_DEFINE([FFTW_ENABLE_VECTOR_RECURSE],[],[desc]) - fi - - dnl ----------------------------------------------------------------------- -@@ -95,6 +97,7 @@ - AM_PROG_LIBTOOL - AC_CHECK_PROG(PERL, perl, perl, echo perl) - AC_SUBST(PERL) -+AC_SUBST(CC) - - dnl ----------------------------------------------------------------------- - -@@ -115,7 +118,7 @@ - dnl ----------------------------------------------------------------------- - - AC_SUBST(SHARED_VERSION_INFO) --AC_DEFINE_UNQUOTED(FFTW_VERSION, "$VERSION") -+AC_DEFINE_UNQUOTED([FFTW_VERSION], "$VERSION",[Version]) - - # Get the version number that will be appended to shared libraries: - SHARED_VERSION=`echo $SHARED_VERSION_INFO | awk -F':' '{ print $1 "." $3 "." $2 }'` -@@ -123,7 +126,7 @@ - - ACX_PROG_CC_MAXOPT - --ACX_GCC_ALIGNS_STACK(AC_DEFINE(FFTW_GCC_ALIGNS_STACK), [ -+ACX_GCC_ALIGNS_STACK(AC_DEFINE([FFTW_GCC_ALIGNS_STACK],[],[desc]), [ - if test "$enable_i386_hacks" = yes; then - if test "${acx_gcc_stack_align_bug-no}" = yes; then - # we are using a gcc with a stack alignment bug, and we should -@@ -183,7 +186,7 @@ - AC_TRY_LINK([#include - ], if (!isnan(3.14159)) isnan(2.7183);, ok=yes, ok=no) - if test "$ok" = "yes"; then -- AC_DEFINE(HAVE_ISNAN) -+ AC_DEFINE([HAVE_ISNAN],[],[desc]) - fi - AC_MSG_RESULT(${ok}) - -@@ -196,7 +199,7 @@ - #endif - ], [hrtime_t foobar;], ok=yes, ok=no) - if test "$ok" = "yes"; then -- AC_DEFINE(HAVE_HRTIME_T) -+ AC_DEFINE([HAVE_HRTIME_T],[],[desc]) - fi - AC_MSG_RESULT(${ok}) - -@@ -205,7 +208,7 @@ - - AC_ARG_ENABLE(unsafe-mulmod, [ --enable-unsafe-mulmod risk overflow for large prime sizes], enable_unsafe_mulmod=$enableval, enable_unsafe_mulmod=no) - if test "$enable_unsafe_mulmod" = "yes"; then -- AC_DEFINE(FFTW_ENABLE_UNSAFE_MULMOD) -+ AC_DEFINE([FFTW_ENABLE_UNSAFE_MULMOD],[],[desc]) - fi - - -@@ -243,7 +246,7 @@ - if test -z "$THREADLIBS"; then - AC_MSG_ERROR([don't know how to enable OpenMP]) - fi -- AC_DEFINE(FFTW_USING_OPENMP_THREADS) -+ AC_DEFINE([FFTW_USING_OPENMP_THREADS],[],[desc]) - fi - if test "$with_sgimp"x != nox; then - AC_MSG_CHECKING(how to enable SGI MP) -@@ -261,7 +264,7 @@ - if test -z "$THREADLIBS"; then - AC_MSG_ERROR([don't know how to enable SGI MP]) - fi -- AC_DEFINE(FFTW_USING_SGIMP_THREADS) -+ AC_DEFINE([FFTW_USING_SGIMP_THREADS],[],[desc]) - fi - - # POSIX threads, the default choice: -@@ -270,38 +273,38 @@ - ACX_PTHREAD([THREADLIBS="$PTHREAD_LIBS " - CFLAGS="$CFLAGS $PTHREAD_CFLAGS" - CC="$PTHREAD_CC" -- AC_DEFINE(FFTW_USING_POSIX_THREADS)]) -+ AC_DEFINE([FFTW_USING_POSIX_THREADS],[],[desc])]) - fi - # Solaris threads: - if test -z "$THREADLIBS"; then - AC_CHECK_LIB(thread, thr_create, - [THREADLIBS="-lthread" -- AC_DEFINE(FFTW_USING_SOLARIS_THREADS)]) -+ AC_DEFINE([FFTW_USING_SOLARIS_THREADS],[],[desc])]) - fi - # Mach C threads: - if test -z "$THREADLIBS"; then - AC_CHECK_FUNC(cthread_fork, - [THREADLIBS=" " -- AC_DEFINE(FFTW_USING_MACH_THREADS)]) -+ AC_DEFINE([FFTW_USING_MACH_THREADS],[],[desc])]) - AC_CHECK_HEADERS(mach/cthreads.h cthreads.h cthread.h) - fi - if test -z "$THREADLIBS"; then - AC_CHECK_LIB(cthread, cthread_fork, - [THREADLIBS="-lcthread" -- AC_DEFINE(FFTW_USING_MACH_THREADS)]) -+ AC_DEFINE([FFTW_USING_MACH_THREADS],[],[desc])]) - AC_CHECK_HEADERS(mach/cthreads.h cthreads.h cthread.h) - fi - if test -z "$THREADLIBS"; then - AC_CHECK_LIB(cthreads, cthread_fork, - [THREADLIBS="-lcthreads" -- AC_DEFINE(FFTW_USING_MACH_THREADS)]) -+ AC_DEFINE([FFTW_USING_MACH_THREADS],[],[desc])]) - AC_CHECK_HEADERS(mach/cthreads.h cthreads.h cthread.h) - fi - # BeOS threads: - if test -z "$THREADLIBS"; then - AC_CHECK_FUNC(spawn_thread, - [THREADLIBS=" " -- AC_DEFINE(FFTW_USING_BEOS_THREADS)]) -+ AC_DEFINE([FFTW_USING_BEOS_THREADS],[],[desc])]) - fi - if test -z "$THREADLIBS"; then - AC_MSG_ERROR(couldn't find threads library for --enable-threads) -@@ -334,7 +337,7 @@ - CC="$MPICC" - ok=yes - AC_TRY_LINK([#include -- ], [MPI_Comm_f2c(0);], [AC_DEFINE(HAVE_MPI_COMM_F2C)], [ok=no]) -+ ], [MPI_Comm_f2c(0);], [AC_DEFINE([HAVE_MPI_COMM_F2C],[],[desc])], [ok=no]) - AC_MSG_RESULT($ok) - CC="$save_CC" - else diff --git a/math/fftw/pkg-plist b/math/fftw/pkg-plist index 4c398a5fdf8b..d788c68fa1a5 100644 --- a/math/fftw/pkg-plist +++ b/math/fftw/pkg-plist @@ -4,9 +4,11 @@ lib/lib%%FFTW_SUFX%%fftw.a lib/lib%%FFTW_SUFX%%fftw.la lib/lib%%FFTW_SUFX%%fftw.so lib/lib%%FFTW_SUFX%%fftw.so.2 +lib/lib%%FFTW_SUFX%%fftw.so.2.0.7 lib/lib%%FFTW_SUFX%%rfftw.a lib/lib%%FFTW_SUFX%%rfftw.la lib/lib%%FFTW_SUFX%%rfftw.so lib/lib%%FFTW_SUFX%%rfftw.so.2 -%%DEF%%%%PORTDOCS%%%%DOCSDIR%%/fftw.ps -%%DEF%%%%PORTDOCS%%@dirrm %%DOCSDIR%% +lib/lib%%FFTW_SUFX%%rfftw.so.2.0.7 +%%PORTDOCS%%%%DOCSDIR%%/fftw.ps +%%PORTDOCS%%@dirrm %%DOCSDIR%%