diff options
| author |   Sebastien Fabbro <bicatali@gentoo.org> | 2008-04-03 17:11:30 +0000 |
|---|---|---|
| committer | Sebastien Fabbro <bicatali@gentoo.org> | 2008-04-03 17:11:30 +0000 |
| commit | 3d7bd9564f98347ccf395613e56846d261661860 (patch) | |
| tree | 62aeb2e4c639b0918e955402eafb16214c019ac6 /sci-libs/fftw | |
| parent | Version bumped. (diff) | |
| download | gentoo-2-3d7bd9564f98347ccf395613e56846d261661860.tar.gz gentoo-2-3d7bd9564f98347ccf395613e56846d261661860.tar.bz2 gentoo-2-3d7bd9564f98347ccf395613e56846d261661860.zip | |
Fixed the as-needed patch in order to internally link test_sched.c
(Portage version: 2.1.4.4)
Diffstat (limited to 'sci-libs/fftw')
| -rw-r--r-- | sci-libs/fftw/ChangeLog | 6 | ||||
| -rw-r--r-- | sci-libs/fftw/files/fftw-2.1.5-as-needed.patch | 84 |
2 files changed, 66 insertions, 24 deletions
diff --git a/sci-libs/fftw/ChangeLog b/sci-libs/fftw/ChangeLog index 01ad2734bb54..7bbb8503575a 100644 --- a/sci-libs/fftw/ChangeLog +++ b/sci-libs/fftw/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sci-libs/fftw # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/ChangeLog,v 1.63 2008/04/01 22:10:25 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/ChangeLog,v 1.64 2008/04/03 17:11:30 bicatali Exp $ + + 03 Apr 2008; Sébastien Fabbro <bicatali@gentoo.org> + files/fftw-2.1.5-as-needed.patch: + Fixed the as-needed patch in order to internally link test_sched.c 01 Apr 2008; Sébastien Fabbro <bicatali@gentoo.org> +files/fftw-2.1.5-configure.in.patch, -files/3-tmpfile.patch, diff --git a/sci-libs/fftw/files/fftw-2.1.5-as-needed.patch b/sci-libs/fftw/files/fftw-2.1.5-as-needed.patch index d1c20d40e94f..2389f0e43f79 100644 --- a/sci-libs/fftw/files/fftw-2.1.5-as-needed.patch +++ b/sci-libs/fftw/files/fftw-2.1.5-as-needed.patch @@ -1,5 +1,5 @@ ---- ./rfftw/Makefile.am.orig 2008-03-31 19:42:10.819805758 +0100 -+++ ./rfftw/Makefile.am 2008-03-31 19:43:47.624901125 +0100 +--- rfftw/Makefile.am.orig 2008-04-03 15:23:06.989019659 +0000 ++++ rfftw/Makefile.am 2008-04-03 15:23:35.658653448 +0000 @@ -18,6 +18,7 @@ rfftw.h @@ -8,8 +8,8 @@ MAINTAINERCLEANFILES = $(CODELETS) rconfig.c DISTCLEANFILES = srfftw.h drfftw.h ---- ./threads/Makefile.am.orig 2008-03-31 19:42:30.555058968 +0100 -+++ ./threads/Makefile.am 2008-03-31 21:59:25.500856903 +0100 +--- threads/Makefile.am.orig 2008-04-03 15:23:10.101197011 +0000 ++++ threads/Makefile.am 2008-04-03 15:23:35.662653676 +0000 @@ -28,6 +28,10 @@ -version-info @SHARED_VERSION_INFO@ \ -rpath $(libdir) @@ -33,42 +33,80 @@ @FFTW_PREFIX1@rfftw_threads.h: rfftw_threads.h rm -f $@ sed 's/\"fftw/\"@FFTW_PREFIX@fftw/g;s/\"rfftw/\"@FFTW_PREFIX@rfftw/g' $(srcdir)/rfftw_threads.h > $@ ---- ./mpi/Makefile.am.orig 2008-03-31 19:42:18.984187252 +0100 -+++ ./mpi/Makefile.am 2008-03-31 22:19:12.879672814 +0100 +--- mpi/Makefile.am.orig 2008-04-03 15:22:43.811698858 +0000 ++++ mpi/Makefile.am 2008-04-03 15:25:50.930362143 +0000 @@ -28,6 +28,9 @@ -version-info @SHARED_VERSION_INFO@ \ -rpath $(libdir) +lib@FFTW_PREFIX@fftw_mpi_la_LIBADD = \ -+ $(FFTWDIR)/lib@FFTW_PREFIX@fftw.la @MPILIBS@ ++ @MPILIBS@ $(FFTWDIR)/lib@FFTW_PREFIX@fftw.la + @FFTW_PREFIX1@fftw_mpi.h: fftw_mpi.h rm -f $@ sed 's/\"fftw/\"@FFTW_PREFIX@fftw/g;s/\"rfftw/\"@FFTW_PREFIX@rfftw/g' $(srcdir)/fftw_mpi.h > $@ -@@ -39,7 +42,12 @@ +@@ -39,32 +42,38 @@ -version-info @SHARED_VERSION_INFO@ \ -rpath $(libdir) -@FFTW_PREFIX1@rfftw_mpi.h: rfftw_mpi.h +lib@FFTW_PREFIX@rfftw_mpi_la_LIBADD = \ -+ $(RFFTWDIR)/lib@FFTW_PREFIX@rfftw.la \ -+ $(FFTWDIR)/lib@FFTW_PREFIX@fftw.la \ -+ @MPILIBS@ ++ @MPILIBS@ \ ++ $(RFFTWDIR)/lib@FFTW_PREFIX@rfftw.la \ ++ $(FFTWDIR)/lib@FFTW_PREFIX@fftw.la + +@FFTW_PREFIX1@rfftw_mpi.h: rfftw_mpi.h rm -f $@ sed 's/\"fftw/\"@FFTW_PREFIX@fftw/g;s/\"rfftw/\"@FFTW_PREFIX@rfftw/g' $(srcdir)/rfftw_mpi.h > $@ ---- ./acx_mpi.m4.orig 2008-03-31 22:19:34.864925682 +0100 -+++ ./acx_mpi.m4 2008-03-31 22:22:44.923756518 +0100 -@@ -53,8 +53,8 @@ - ]) + CLEANFILES = @FFTW_PREFIX1@fftw_mpi.h @FFTW_PREFIX1@rfftw_mpi.h - if test x = x"$MPILIBS"; then -- AC_LANG_CASE([C], [AC_CHECK_FUNC(MPI_Init, [MPILIBS=" "])], -- [C++], [AC_CHECK_FUNC(MPI_Init, [MPILIBS=" "])], -+ AC_LANG_CASE([C], [AC_CHECK_FUNC(MPI_Init, [MPILIBS="-lmpi"])], -+ [C++], [AC_CHECK_FUNC(MPI_Init, [MPILIBS="-lmpi"])], - [Fortran 77], [AC_MSG_CHECKING([for MPI_Init]) - AC_TRY_LINK([],[ call MPI_Init], [MPILIBS=" " - AC_MSG_RESULT(yes)], [AC_MSG_RESULT(no)])]) + test_sched_SOURCES = test_sched.c +-test_sched_LDADD = lib@FFTW_PREFIX@fftw_mpi.la \ +- $(FFTWDIR)/lib@FFTW_PREFIX@fftw.la @MPILIBS@ ++test_sched_LDADD = @MPILIBS@ lib@FFTW_PREFIX@fftw_mpi.la \ ++ $(FFTWDIR)/lib@FFTW_PREFIX@fftw.la + + test_transpose_mpi_SOURCES = test_transpose_mpi.c +-test_transpose_mpi_LDADD = lib@FFTW_PREFIX@fftw_mpi.la \ +- $(FFTWDIR)/lib@FFTW_PREFIX@fftw.la @MPILIBS@ ++test_transpose_mpi_LDADD = @MPILIBS@ lib@FFTW_PREFIX@fftw_mpi.la \ ++ $(FFTWDIR)/lib@FFTW_PREFIX@fftw.la + + fftw_mpi_test_SOURCES = fftw_mpi_test.c + fftw_mpi_test_LDADD = ../tests/test_main.o \ ++ @MPILIBS@ \ + lib@FFTW_PREFIX@fftw_mpi.la \ +- $(FFTWDIR)/lib@FFTW_PREFIX@fftw.la @MPILIBS@ ++ $(FFTWDIR)/lib@FFTW_PREFIX@fftw.la + + rfftw_mpi_test_SOURCES = rfftw_mpi_test.c + rfftw_mpi_test_LDADD = ../tests/test_main.o \ ++ @MPILIBS@ \ + lib@FFTW_PREFIX@rfftw_mpi.la \ + lib@FFTW_PREFIX@fftw_mpi.la \ + $(RFFTWDIR)/lib@FFTW_PREFIX@rfftw.la \ +- $(FFTWDIR)/lib@FFTW_PREFIX@fftw.la \ +- @MPILIBS@ ++ $(FFTWDIR)/lib@FFTW_PREFIX@fftw.la + + # for some reason, automake tries to use autoheader in order to + # generate config.h.in, and fails because config.h.in is GNU-lly +--- mpi/test_sched.c.orig 2008-04-03 16:58:01.969033125 +0000 ++++ mpi/test_sched.c 2008-04-03 16:59:27.521908505 +0000 +@@ -27,6 +27,8 @@ + int **sched; + int npes = -1, sortpe = -1, steps; + ++ /* needed to link with proper mpi libs */ ++ MPI_Init(&argc,&argv); + if (argc >= 2) { + npes = atoi(argv[1]); + if (npes <= 0) { +@@ -121,5 +123,6 @@ + } + } + ++ MPI_Finalize(); + return 0; + } |