* [gentoo-commits] proj/sci:master commit in: sci-libs/pfft/files/, sci-libs/pfft/
@ 2011-09-12 18:09 Christoph Junghans
0 siblings, 0 replies; 2+ messages in thread
From: Christoph Junghans @ 2011-09-12 18:09 UTC (permalink / raw
To: gentoo-commits
commit: 506fe16bf225496925fa4a7a4f535d7ed2127ca8
Author: Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 12 18:09:14 2011 +0000
Commit: Christoph Junghans <kleiner_otti <AT> gmx <DOT> de>
CommitDate: Mon Sep 12 18:09:14 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=506fe16b
[sci-libs/pfft] version bump
(Portage version: 2.1.10.11/git/Linux i686, signed Manifest commit with key C2000586)
---
sci-libs/pfft/ChangeLog | 9 +++++
sci-libs/pfft/files/pfft-1.0alpha1-Makefile.am | 26 --------------
sci-libs/pfft/files/pfft-1.0alpha2-Makefile.am | 35 ++++++++++++++++++++
...a1-configure.ac => pfft-1.0alpha2-configure.ac} | 7 +---
...-libpfft.pc.in => pfft-1.0alpha2-libpfft.pc.in} | 0
sci-libs/pfft/metadata.xml | 4 +-
...ft-1.0_alpha1.ebuild => pfft-1.0_alpha2.ebuild} | 24 ++++++++------
7 files changed, 61 insertions(+), 44 deletions(-)
diff --git a/sci-libs/pfft/ChangeLog b/sci-libs/pfft/ChangeLog
index 4ba70e3..c5d945a 100644
--- a/sci-libs/pfft/ChangeLog
+++ b/sci-libs/pfft/ChangeLog
@@ -2,6 +2,15 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*pfft-1.0_alpha2 (11 Sep 2011)
+
+ 11 Sep 2011; Christoph Junghans <ottxor@gentoo.org> -pfft-1.0_alpha1.ebuild,
+ +pfft-1.0_alpha2.ebuild, -files/pfft-1.0alpha1-Makefile.am,
+ -files/pfft-1.0alpha1-configure.ac, -files/pfft-1.0alpha1-libpfft.pc.in,
+ +files/pfft-1.0alpha2-Makefile.am, +files/pfft-1.0alpha2-configure.ac,
+ +files/pfft-1.0alpha2-libpfft.pc.in, metadata.xml:
+ version bump
+
24 Jun 2011; Justin Lecher <jlec@gentoo.org> pfft-1.0_alpha1.ebuild:
Fixed Manifest and cleaned ebuild
diff --git a/sci-libs/pfft/files/pfft-1.0alpha1-Makefile.am b/sci-libs/pfft/files/pfft-1.0alpha1-Makefile.am
deleted file mode 100644
index 2551694..0000000
--- a/sci-libs/pfft/files/pfft-1.0alpha1-Makefile.am
+++ /dev/null
@@ -1,26 +0,0 @@
-ACLOCAL_AMFLAGS = -I config
-
-lib_LTLIBRARIES = libpfft.la
-
-libpfft_la_LDFLAGS = -no-undefined -version-info @SHARED_VERSION_INFO@
-libpfft_la_SOURCES = \
- check.c profiles.c transpose.c dft-parallel.c \
- dft-serial.c api-basic.c api-adv.c api-guru.c \
- utils.c block.c malloc.c getargs.c \
- gcells_plan.c gcells_sendrecv.c gcells_RMA.c
-
-include_HEADERS = pfft.h
-noinst_HEADERS = ipfft.h
-
-noinst_PROGRAMS = simple_test sample_ghost
-
-LDADD = libpfft.la
-
-install-exec-hook:
-if NO_LA_FILES
- rm -f $(DESTDIR)$(libdir)/libpfft.la
-endif
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libpfft.pc
-
diff --git a/sci-libs/pfft/files/pfft-1.0alpha2-Makefile.am b/sci-libs/pfft/files/pfft-1.0alpha2-Makefile.am
new file mode 100644
index 0000000..6325c83
--- /dev/null
+++ b/sci-libs/pfft/files/pfft-1.0alpha2-Makefile.am
@@ -0,0 +1,35 @@
+ACLOCAL_AMFLAGS = -I config
+
+lib_LTLIBRARIES = libpfft.la
+
+libpfft_la_LDFLAGS = -no-undefined -version-info @SHARED_VERSION_INFO@
+libpfft_la_SOURCES = \
+ check.c profiles.c transpose.c \
+ dft-parallel.c dft-serial.c \
+ api-basic.c api-adv.c api-guru.c \
+ utils.c timer.c gctimer.c block.c malloc.c getargs.c \
+ gcells_plan.c gcells_sendrecv.c gcells_RMA.c \
+ fortran_api.c
+
+include_HEADERS = pfft.h pfft.f
+noinst_HEADERS = ipfft.h
+
+check_PROGRAMS = simple_test sample_ghost \
+ fortran_simple_test fortran_ghost_test
+
+fortran_simple_test_SOURCES = fortran_simple_test.F90
+
+fortran_ghost_test_SOURCES = fortran_ghost_test.F90
+
+PTRDIFF_T_KIND = 8
+pfft.f: pfft.f.in
+ echo " integer, parameter :: ptrdiff_t_kind =" $(PTRDIFF_T_KIND) > $@
+ cat $< >> $@
+
+BUILT_SOURCES = pfft.f
+
+LDADD = libpfft.la
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = libpfft.pc
+
diff --git a/sci-libs/pfft/files/pfft-1.0alpha1-configure.ac b/sci-libs/pfft/files/pfft-1.0alpha2-configure.ac
similarity index 83%
rename from sci-libs/pfft/files/pfft-1.0alpha1-configure.ac
rename to sci-libs/pfft/files/pfft-1.0alpha2-configure.ac
index 9955413..24d5abd 100644
--- a/sci-libs/pfft/files/pfft-1.0alpha1-configure.ac
+++ b/sci-libs/pfft/files/pfft-1.0alpha2-configure.ac
@@ -10,18 +10,13 @@ AM_INIT_AUTOMAKE([1.8 foreign])
SHARED_VERSION_INFO="1:0:0"
AC_SUBST(SHARED_VERSION_INFO)
-AC_ARG_ENABLE(la-files,
- [AS_HELP_STRING([--disable-la-files],[Do NOT install GNU libtool's la files])],,
- [enable_la_files=yes])
-
-AM_CONDITIONAL(NO_LA_FILES,[test "$enable_la_files" = no])
-
# Checks for programs.
AC_PROG_CC(mpicc)
AC_PROG_CC_C99
if test "$ac_cv_prog_cc_c99" = "no"; then
AC_MSG_ERROR([Compiler does not understand c99])
fi
+AC_PROG_FC(mpif90)
LT_INIT
# Checks for libraries.
diff --git a/sci-libs/pfft/files/pfft-1.0alpha1-libpfft.pc.in b/sci-libs/pfft/files/pfft-1.0alpha2-libpfft.pc.in
similarity index 100%
rename from sci-libs/pfft/files/pfft-1.0alpha1-libpfft.pc.in
rename to sci-libs/pfft/files/pfft-1.0alpha2-libpfft.pc.in
diff --git a/sci-libs/pfft/metadata.xml b/sci-libs/pfft/metadata.xml
index 69b66cb..119d0fd 100644
--- a/sci-libs/pfft/metadata.xml
+++ b/sci-libs/pfft/metadata.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>sci</herd>
+ <herd>sci</herd>
<maintainer>
- <email>kleiner_otti@gmx.de</email>
+ <email>ottxor@gentoo.org</email>
<name>Christoph Junghans</name>
</maintainer>
</pkgmetadata>
diff --git a/sci-libs/pfft/pfft-1.0_alpha1.ebuild b/sci-libs/pfft/pfft-1.0_alpha2.ebuild
similarity index 60%
rename from sci-libs/pfft/pfft-1.0_alpha1.ebuild
rename to sci-libs/pfft/pfft-1.0_alpha2.ebuild
index d44f96a..c84b6f0 100644
--- a/sci-libs/pfft/pfft-1.0_alpha1.ebuild
+++ b/sci-libs/pfft/pfft-1.0_alpha2.ebuild
@@ -4,7 +4,7 @@
EAPI=4
-inherit autotools eutils
+inherit autotools-utils eutils flag-o-matic fortran-2
DESCRIPTION="Parallel 3d FFT"
HOMEPAGE="http://www-user.tu-chemnitz.de/~mpip/software.php"
@@ -13,24 +13,28 @@ SRC_URI="http://www-user.tu-chemnitz.de/~mpip/software/${P//_}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~x86 ~amd64"
-IUSE="static-libs"
+IUSE="static-libs test"
RDEPEND="
- =sci-libs/fftw-3.3*[mpi]
- virtual/mpi"
-DEPEND="${RDEPEND}"
+ =sci-libs/fftw-3.3*[mpi,fortran]
+ virtual/mpi
+ "
+
+DEPEND="
+ ${RDEPEND}
+ test? ( virtual/fortran )
+ "
S="${WORKDIR}/${P//_}"
src_prepare() {
local i
+ use test && fortran-2_pkg_setup
for i in Makefile.am configure.ac libpfft.pc.in; do
- cp "${FILESDIR}"/"${PF//_}"-"${i}" "${i}" || die "cp of ${i} failed"
+ cp "${FILESDIR}"/"${PF//_}"-"${i}" "${i}" || die
done
- eautoreconf
-}
+ append-cppflags "-I${EROOT}/usr/include"
-src_configure() {
- econf --disable-la-files "$(use_enable static-libs static)"
+ eautoreconf
}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/pfft/files/, sci-libs/pfft/
@ 2012-07-07 23:30 Christoph Junghans
0 siblings, 0 replies; 2+ messages in thread
From: Christoph Junghans @ 2012-07-07 23:30 UTC (permalink / raw
To: gentoo-commits
commit: 817dc340f3f4a5d1981e785c54f830a7baecd617
Author: Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 7 23:29:50 2012 +0000
Commit: Christoph Junghans <kleiner_otti <AT> gmx <DOT> de>
CommitDate: Sat Jul 7 23:29:50 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=817dc340
pfft: removed - never used
---
sci-libs/pfft/ChangeLog | 28 ---------------
sci-libs/pfft/files/pfft-1.0alpha2-Makefile.am | 35 -------------------
sci-libs/pfft/files/pfft-1.0alpha2-configure.ac | 40 ----------------------
sci-libs/pfft/files/pfft-1.0alpha2-libpfft.pc.in | 13 -------
sci-libs/pfft/metadata.xml | 9 -----
sci-libs/pfft/pfft-1.0_alpha2.ebuild | 40 ----------------------
6 files changed, 0 insertions(+), 165 deletions(-)
diff --git a/sci-libs/pfft/ChangeLog b/sci-libs/pfft/ChangeLog
deleted file mode 100644
index c5d945a..0000000
--- a/sci-libs/pfft/ChangeLog
+++ /dev/null
@@ -1,28 +0,0 @@
-# ChangeLog for sci-libs/pfft
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-*pfft-1.0_alpha2 (11 Sep 2011)
-
- 11 Sep 2011; Christoph Junghans <ottxor@gentoo.org> -pfft-1.0_alpha1.ebuild,
- +pfft-1.0_alpha2.ebuild, -files/pfft-1.0alpha1-Makefile.am,
- -files/pfft-1.0alpha1-configure.ac, -files/pfft-1.0alpha1-libpfft.pc.in,
- +files/pfft-1.0alpha2-Makefile.am, +files/pfft-1.0alpha2-configure.ac,
- +files/pfft-1.0alpha2-libpfft.pc.in, metadata.xml:
- version bump
-
- 24 Jun 2011; Justin Lecher <jlec@gentoo.org> pfft-1.0_alpha1.ebuild:
- Fixed Manifest and cleaned ebuild
-
- 15 Sep 2010; Christoph Junghans <kleiner_otti@gmx.de>
- pfft-1.0_alpha1.ebuild, files/pfft-1.0alpha1-Makefile.am,
- files/pfft-1.0alpha1-configure.ac, +files/pfft-1.0alpha1-libpfft.pc.in:
- added --disable-la-files option
-
-*pfft-1.0_alpha1 (12 Sep 2010)
-
- 12 Sep 2010; Christoph Junghans <kleiner_otti@gmx.de>
- +pfft-1.0_alpha1.ebuild, +files/pfft-1.0alpha1-Makefile.am,
- +files/pfft-1.0alpha1-configure.ac, +metadata.xml, +metadata.xml~:
- Initial commit
-
diff --git a/sci-libs/pfft/files/pfft-1.0alpha2-Makefile.am b/sci-libs/pfft/files/pfft-1.0alpha2-Makefile.am
deleted file mode 100644
index 6325c83..0000000
--- a/sci-libs/pfft/files/pfft-1.0alpha2-Makefile.am
+++ /dev/null
@@ -1,35 +0,0 @@
-ACLOCAL_AMFLAGS = -I config
-
-lib_LTLIBRARIES = libpfft.la
-
-libpfft_la_LDFLAGS = -no-undefined -version-info @SHARED_VERSION_INFO@
-libpfft_la_SOURCES = \
- check.c profiles.c transpose.c \
- dft-parallel.c dft-serial.c \
- api-basic.c api-adv.c api-guru.c \
- utils.c timer.c gctimer.c block.c malloc.c getargs.c \
- gcells_plan.c gcells_sendrecv.c gcells_RMA.c \
- fortran_api.c
-
-include_HEADERS = pfft.h pfft.f
-noinst_HEADERS = ipfft.h
-
-check_PROGRAMS = simple_test sample_ghost \
- fortran_simple_test fortran_ghost_test
-
-fortran_simple_test_SOURCES = fortran_simple_test.F90
-
-fortran_ghost_test_SOURCES = fortran_ghost_test.F90
-
-PTRDIFF_T_KIND = 8
-pfft.f: pfft.f.in
- echo " integer, parameter :: ptrdiff_t_kind =" $(PTRDIFF_T_KIND) > $@
- cat $< >> $@
-
-BUILT_SOURCES = pfft.f
-
-LDADD = libpfft.la
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libpfft.pc
-
diff --git a/sci-libs/pfft/files/pfft-1.0alpha2-configure.ac b/sci-libs/pfft/files/pfft-1.0alpha2-configure.ac
deleted file mode 100644
index 24d5abd..0000000
--- a/sci-libs/pfft/files/pfft-1.0alpha2-configure.ac
+++ /dev/null
@@ -1,40 +0,0 @@
-AC_PREREQ([2.65])
-AC_INIT([pfft], [1.0alpha1], [michael.pippig@mathematik.tu-chemnitz.de])
-
-AC_CONFIG_AUX_DIR(config)
-AC_CONFIG_MACRO_DIR(config)
-AC_CONFIG_HEADERS([config.h])
-
-AM_INIT_AUTOMAKE([1.8 foreign])
-
-SHARED_VERSION_INFO="1:0:0"
-AC_SUBST(SHARED_VERSION_INFO)
-
-# Checks for programs.
-AC_PROG_CC(mpicc)
-AC_PROG_CC_C99
-if test "$ac_cv_prog_cc_c99" = "no"; then
- AC_MSG_ERROR([Compiler does not understand c99])
-fi
-AC_PROG_FC(mpif90)
-
-LT_INIT
-# Checks for libraries.
-AC_CHECK_HEADERS([fftw3.h])
-AC_CHECK_LIB([fftw3],main,,AC_MSG_ERROR([Cannot find fftw3 library]))
-AC_CHECK_HEADERS([fftw3-mpi.h])
-AC_CHECK_LIB([fftw3_mpi],main,,AC_MSG_ERROR([Cannot find fftw3_mpi library]))
-
-# Checks for header files.
-AC_CHECK_HEADERS([stddef.h stdlib.h string.h])
-
-# Checks for typedefs, structures, and compiler characteristics.
-AC_TYPE_SIZE_T
-AC_CHECK_TYPES([ptrdiff_t])
-
-# Checks for library functions.
-AC_CHECK_FUNCS([pow sqrt])
-
-AC_CONFIG_FILES([Makefile])
-AC_CONFIG_FILES([libpfft.pc])
-AC_OUTPUT
diff --git a/sci-libs/pfft/files/pfft-1.0alpha2-libpfft.pc.in b/sci-libs/pfft/files/pfft-1.0alpha2-libpfft.pc.in
deleted file mode 100644
index f2c7f90..0000000
--- a/sci-libs/pfft/files/pfft-1.0alpha2-libpfft.pc.in
+++ /dev/null
@@ -1,13 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: libpfft
-Description: parallel 3d FFT
-URL: http://www-user.tu-chemnitz.de/~mpip/software.php
-Version: @VERSION@
-Requires: fftw_mpi
-Libs: -L${libdir} -lpfft
-Libs.private: -lm
-Cflags: -I${includedir}
diff --git a/sci-libs/pfft/metadata.xml b/sci-libs/pfft/metadata.xml
deleted file mode 100644
index 119d0fd..0000000
--- a/sci-libs/pfft/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <herd>sci</herd>
- <maintainer>
- <email>ottxor@gentoo.org</email>
- <name>Christoph Junghans</name>
- </maintainer>
-</pkgmetadata>
diff --git a/sci-libs/pfft/pfft-1.0_alpha2.ebuild b/sci-libs/pfft/pfft-1.0_alpha2.ebuild
deleted file mode 100644
index c84b6f0..0000000
--- a/sci-libs/pfft/pfft-1.0_alpha2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-inherit autotools-utils eutils flag-o-matic fortran-2
-
-DESCRIPTION="Parallel 3d FFT"
-HOMEPAGE="http://www-user.tu-chemnitz.de/~mpip/software.php"
-SRC_URI="http://www-user.tu-chemnitz.de/~mpip/software/${P//_}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="static-libs test"
-
-RDEPEND="
- =sci-libs/fftw-3.3*[mpi,fortran]
- virtual/mpi
- "
-
-DEPEND="
- ${RDEPEND}
- test? ( virtual/fortran )
- "
-
-S="${WORKDIR}/${P//_}"
-
-src_prepare() {
- local i
- use test && fortran-2_pkg_setup
- for i in Makefile.am configure.ac libpfft.pc.in; do
- cp "${FILESDIR}"/"${PF//_}"-"${i}" "${i}" || die
- done
-
- append-cppflags "-I${EROOT}/usr/include"
-
- eautoreconf
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-07-07 23:30 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-09-12 18:09 [gentoo-commits] proj/sci:master commit in: sci-libs/pfft/files/, sci-libs/pfft/ Christoph Junghans
-- strict thread matches above, loose matches on Subject: below --
2012-07-07 23:30 Christoph Junghans
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox