On Sat, Oct 13, 2012 at 05:10:24PM +0400, Kirill Bychkov wrote: > Hi. This patch enables threaded libs in math/fftw3. The are required by > upcoming luminance-hdr port. > Regression tests were completed with no errors on amd64. Also tested with > scorched3d game - no fallout. > OK to commit?
Ok. > > Index: Makefile > =================================================================== > RCS file: /cvs/ports/math/fftw3/Makefile,v > retrieving revision 1.22 > diff -u -r1.22 Makefile > --- Makefile 29 Mar 2012 13:38:40 -0000 1.22 > +++ Makefile 16 Jul 2012 06:07:14 -0000 > @@ -10,10 +10,12 @@ > # XXX set it to its default value so that bsd.port.mk won't whine > FULLPKGPATH-main= math/fftw3,-main${FLAVOR_EXT:S/-/,/g} > FULLPKGNAME-common= fftw3-common-${V} > -REVISION-main= 0 > +REVISION-main= 1 > REVISION-common=0 > SHARED_LIBS= fftw3 5.0 \ > - fftw3f 5.0 > + fftw3f 5.0 \ > + fftw3_threads 0.0 \ > + fftw3f_threads 0.0 > CATEGORIES= math > > HOMEPAGE= http://www.fftw.org/ > @@ -40,7 +42,8 @@ > USE_GROFF = Yes > CONFIGURE_STYLE=gnu > CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ > - --enable-portable-binary > + --enable-portable-binary \ > + --enable-threads > > .if ${FLAVOR} == "float" > CONFIGURE_ARGS+=--enable-float > Index: pkg/PFRAG.double-main > =================================================================== > RCS file: /cvs/ports/math/fftw3/pkg/PFRAG.double-main,v > retrieving revision 1.2 > diff -u -r1.2 PFRAG.double-main > --- pkg/PFRAG.double-main 8 Oct 2008 22:27:22 -0000 1.2 > +++ pkg/PFRAG.double-main 16 Jul 2012 06:07:14 -0000 > @@ -4,5 +4,7 @@ > @bin bin/fftw-wisdom > lib/libfftw3.a > lib/libfftw3.la > +lib/libfftw3_threads.a > +lib/libfftw3_threads.la > lib/pkgconfig/fftw3.pc > @man man/man1/fftw-wisdom.1 > Index: pkg/PFRAG.double-shared-main > =================================================================== > RCS file: /cvs/ports/math/fftw3/pkg/PFRAG.double-shared-main,v > retrieving revision 1.1 > diff -u -r1.1 PFRAG.double-shared-main > --- pkg/PFRAG.double-shared-main 21 Nov 2006 20:42:30 -0000 1.1 > +++ pkg/PFRAG.double-shared-main 16 Jul 2012 06:07:14 -0000 > @@ -1,2 +1,3 @@ > @comment $OpenBSD: PFRAG.double-shared-main,v 1.1 2006/11/21 20:42:30 steven > Exp $ > @lib lib/libfftw3.so.${LIBfftw3_VERSION} > +@lib lib/libfftw3_threads.so.${LIBfftw3_threads_VERSION} > Index: pkg/PFRAG.float-main > =================================================================== > RCS file: /cvs/ports/math/fftw3/pkg/PFRAG.float-main,v > retrieving revision 1.2 > diff -u -r1.2 PFRAG.float-main > --- pkg/PFRAG.float-main 8 Oct 2008 22:27:22 -0000 1.2 > +++ pkg/PFRAG.float-main 16 Jul 2012 06:07:14 -0000 > @@ -3,5 +3,7 @@ > @bin bin/fftwf-wisdom > lib/libfftw3f.a > lib/libfftw3f.la > +lib/libfftw3f_threads.a > +lib/libfftw3f_threads.la > lib/pkgconfig/fftw3f.pc > @man man/man1/fftwf-wisdom.1 > Index: pkg/PFRAG.float-shared-main > =================================================================== > RCS file: /cvs/ports/math/fftw3/pkg/PFRAG.float-shared-main,v > retrieving revision 1.1 > diff -u -r1.1 PFRAG.float-shared-main > --- pkg/PFRAG.float-shared-main 21 Nov 2006 20:42:30 -0000 1.1 > +++ pkg/PFRAG.float-shared-main 16 Jul 2012 06:07:14 -0000 > @@ -1,2 +1,3 @@ > @comment $OpenBSD: PFRAG.float-shared-main,v 1.1 2006/11/21 20:42:30 steven > Exp $ > @lib lib/libfftw3f.so.${LIBfftw3f_VERSION} > +@lib lib/libfftw3f_threads.so.${LIBfftw3f_threads_VERSION} >