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 | d6b6efd0f4c62dc71633ee251fd5dca05d79e821 (patch) | |
| tree | 1440f7aef8504133ba0623b192c32778baeefd4c | |
| parent | Version bumped. (diff) | |
| download | historical-d6b6efd0f4c62dc71633ee251fd5dca05d79e821.tar.gz historical-d6b6efd0f4c62dc71633ee251fd5dca05d79e821.tar.bz2 historical-d6b6efd0f4c62dc71633ee251fd5dca05d79e821.zip | |
Fixed the as-needed patch in order to internally link test_sched.c
Package-Manager: portage-2.1.4.4
| -rw-r--r-- | sci-libs/fftw/ChangeLog | 6 | ||||
| -rw-r--r-- | sci-libs/fftw/Manifest | 10 | ||||
| -rw-r--r-- | sci-libs/fftw/files/fftw-2.1.5-as-needed.patch | 84 |
3 files changed, 71 insertions, 29 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/Manifest b/sci-libs/fftw/Manifest index 7ed12aea7fc4..2e6b3e31621a 100644 --- a/sci-libs/fftw/Manifest +++ b/sci-libs/fftw/Manifest @@ -1,19 +1,19 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -AUX fftw-2.1.5-as-needed.patch 3021 RMD160 c62d5bc17d8d7b9c28eb837d94c221beb9528090 SHA1 715156497ff60e5550d56f4fe179e7b7d06b1ff6 SHA256 68a2b0daac793fc8db6bed2eb2edcc0647b99ab17de013ec86a3ab1a73e58853 +AUX fftw-2.1.5-as-needed.patch 4374 RMD160 b9bc387a322cec9d36d7d7ff54e556e907767742 SHA1 3274a914d3532190fb8c2c96d944c85b5ab47237 SHA256 b1d65b2dca62257db5c78e81577fb87b7d79f6eb75b8899de48faabfc702e9f0 AUX fftw-2.1.5-configure.in.patch 6456 RMD160 18d01f44617cc5d7bfd7c34d944caefcd6fd2be0 SHA1 8ebbf4fd43558bd2ec3a9f7402be78d75074eabe SHA256 04aa10f41edb1e5a1c4513021f24fe953c7f2a740a4d15363a6ae24b94bf2a3e AUX fftw-3.1.2-configure.ac.patch 523 RMD160 1b4936d4bdbdc0ee7c39a6b54a3d27a681013a4f SHA1 f77634e1cc92d1e42c368cdfd78af995fcbfa6e2 SHA256 e203086198ec9cb65caddb432dcfe2cc207bb197d22c7ca21c0bc37a0c725ea5 DIST fftw-2.1.5.tar.gz 1256888 RMD160 723308722d76c12710db6473979adf8d086b0909 SHA1 12020b58edc1b0490a83db4aa912fac5dfdfb26b SHA256 f8057fae1c7df8b99116783ef3e94a6a44518d49c72e2e630c24b689c6022630 DIST fftw-3.1.2.tar.gz 2736360 RMD160 13069b3582eeaa1fba1614cdca2dfbc2e45ab585 SHA1 3e4c64009ffb48123a0f30f46c1d89da7810dc67 SHA256 e1b92e97fe27efcbd150212d0d287ac907bd2fef0af32e16284fef5d1c1c26bf EBUILD fftw-2.1.5-r3.ebuild 3172 RMD160 ef9e57e8c42a9681989c8bd6d18f5fea0a3ff807 SHA1 e1b5dc015bcf6750ec73079a18cce641ad132f59 SHA256 0a8ab8b8e0987050061f28a03ae5de7c473ed52879bb2f15dcb0a4296fadd807 EBUILD fftw-3.1.2.ebuild 3027 RMD160 6994d9259a730ad222c7756abbf276a1f196cfbb SHA1 7d7138e59f56affb4ed20e5bd4d31a468d69546b SHA256 e5d064befd168788f76f5099263d8c7503d12f94bd124d12a5e53d1b3779f7fd -MISC ChangeLog 13790 RMD160 b395401d69537b4c27cf1f5e4f1bd980afd68cfb SHA1 a3d3bfe97c4293542d67f9cd67689c5d6871b357 SHA256 eed75e113e2407f05afcefe40d5fdf727ef7cdc96b7fb205db1f3923bd8f3f96 +MISC ChangeLog 13951 RMD160 30830566267e6878d5cbb73fc103a4f09a7796b4 SHA1 402a6f71957a3c45fd5e417a636a0f960a56f779 SHA256 2864d6f96e187c7df3ed23b3523eabad28d6f81f88d4b46b45acecc0307e74cc MISC metadata.xml 637 RMD160 a7f1ab3fce5eae79531875234ca77532d0fd2cfa SHA1 b1cce6af4d119fc1b4f640b33e4ef1a8318a736c SHA256 a2798427fe8d4cbe97cf588e66bf54cc37d9650b9451290c2b6846cc6bb81e50 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.7 (GNU/Linux) -iD8DBQFH8rOY1ycZbhPLE2ARAkPQAJsElcKJoH+Kzzsig6JuTDCRgXG2nACeLCFO -J7b/Pm7q4NW3cMtsmMuXzMU= -=dUcC +iD8DBQFH9Q/R1ycZbhPLE2ARAp9VAJ9p5gCtn435T+46VX1BBc/sHhJGpgCgnjyb +lAmordXtqnVujrhpn6QjapU= +=9R46 -----END PGP SIGNATURE----- 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; + } |