aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbicatali <bicatali@32389bae-6d03-0410-99cf-db05cde120eb>2007-09-27 09:54:55 +0000
committerbicatali <bicatali@32389bae-6d03-0410-99cf-db05cde120eb>2007-09-27 09:54:55 +0000
commit9b08d68398bb108e6ad3d875719d5655245c1296 (patch)
tree6d4fd6797885de22adefd327b714ce086d1e6982
parentfreemat-3.5 (diff)
downloadsci-9b08d68398bb108e6ad3d875719d5655245c1296.tar.gz
sci-9b08d68398bb108e6ad3d875719d5655245c1296.tar.bz2
sci-9b08d68398bb108e6ad3d875719d5655245c1296.zip
harminv: fixed autotools
git-svn-id: http://overlays.gentoo.org/svn/proj/science/overlay@749 32389bae-6d03-0410-99cf-db05cde120eb
-rw-r--r--sci-physics/harminv/Manifest12
-rw-r--r--sci-physics/harminv/files/harminv-1.3.1-configure.ac.patch31
-rw-r--r--sci-physics/harminv/harminv-1.3.1.ebuild23
-rw-r--r--sci-physics/meep/Manifest12
-rw-r--r--sci-physics/meep/files/meep-0.10-configure.ac.patch11
-rw-r--r--sci-physics/meep/meep-0.10.ebuild17
6 files changed, 78 insertions, 28 deletions
diff --git a/sci-physics/harminv/Manifest b/sci-physics/harminv/Manifest
index 47f39a179..d6ced7798 100644
--- a/sci-physics/harminv/Manifest
+++ b/sci-physics/harminv/Manifest
@@ -1,8 +1,12 @@
+AUX harminv-1.3.1-configure.ac.patch 1038 RMD160 5430e58f33e639df9fd7b8babb60ab2c1635346e SHA1 9c30c6d5e4a9b84e97197d174a613ab446b7a066 SHA256 4fadb381e6d5edc95a5b3c365b1b5d36d1e9c925eb408ea56a70f3e6832273e0
+MD5 ef061cb97d147e933b2435bb16c846bd files/harminv-1.3.1-configure.ac.patch 1038
+RMD160 5430e58f33e639df9fd7b8babb60ab2c1635346e files/harminv-1.3.1-configure.ac.patch 1038
+SHA256 4fadb381e6d5edc95a5b3c365b1b5d36d1e9c925eb408ea56a70f3e6832273e0 files/harminv-1.3.1-configure.ac.patch 1038
DIST harminv-1.3.1.tar.gz 327832 RMD160 340de65da54b197f70adec43ecd2907a757d6d35 SHA1 ef75161233df92393110b783d2945b5915c8291a SHA256 245778c16390c22850de3fb716c3db19514d40415ee3693293bfe59c66536583
-EBUILD harminv-1.3.1.ebuild 809 RMD160 f241d01a2931e9890668b6b0ce7dcce82fbedeb1 SHA1 cd8499708263481924f6512a8aae5ce0a2f498cc SHA256 1fa86c673000532bf8e631a477891a1e6e4b9bd7f8c210ef15622b8ffa30b1d0
-MD5 2f79b0a2a6f21b4110c44f62acbfb385 harminv-1.3.1.ebuild 809
-RMD160 f241d01a2931e9890668b6b0ce7dcce82fbedeb1 harminv-1.3.1.ebuild 809
-SHA256 1fa86c673000532bf8e631a477891a1e6e4b9bd7f8c210ef15622b8ffa30b1d0 harminv-1.3.1.ebuild 809
+EBUILD harminv-1.3.1.ebuild 860 RMD160 7dce453440bb3edcbee5fb9375bf8a0b2cd1da7c SHA1 b99cf3730953d88875b122e52bdfea8da7e96cd5 SHA256 0526fe3577d81cfc55b3462f947dae40cbc5f4834c70acd392c3ec21a8017f49
+MD5 b18ebe8834400ad440ee322e7bcb3675 harminv-1.3.1.ebuild 860
+RMD160 7dce453440bb3edcbee5fb9375bf8a0b2cd1da7c harminv-1.3.1.ebuild 860
+SHA256 0526fe3577d81cfc55b3462f947dae40cbc5f4834c70acd392c3ec21a8017f49 harminv-1.3.1.ebuild 860
MISC ChangeLog 404 RMD160 65732a6cae3f0519a05532e1516c865e42f30ecd SHA1 8a6d0117b9336fd67c8fef3bcde69b30d007ba13 SHA256 d125a5ac3a2845726f42b255003c3986131b6eb0d950c58dccdcb58d32fb8ff7
MD5 f55506fe737a05c849497474de93189b ChangeLog 404
RMD160 65732a6cae3f0519a05532e1516c865e42f30ecd ChangeLog 404
diff --git a/sci-physics/harminv/files/harminv-1.3.1-configure.ac.patch b/sci-physics/harminv/files/harminv-1.3.1-configure.ac.patch
new file mode 100644
index 000000000..2830d5b58
--- /dev/null
+++ b/sci-physics/harminv/files/harminv-1.3.1-configure.ac.patch
@@ -0,0 +1,31 @@
+--- configure.ac.orig 2007-09-27 09:27:28.731439558 +0100
++++ configure.ac 2007-09-27 09:37:45.755835491 +0100
+@@ -9,7 +9,7 @@
+ # *not* the same as the "public" version number. CURRENT:REVISION:AGE
+ SHARED_VERSION_INFO="2:4:0"
+ AC_SUBST(SHARED_VERSION_INFO)
+-AM_ENABLE_SHARED(no) dnl shared libs cause too many headaches to be default
++AM_ENABLE_SHARED(yes) dnl shared libs cause too many headaches to be default
+
+ ##############################################################################
+
+@@ -123,9 +123,16 @@
+ ###########################################################################
+
+ # Checks for BLAS/LAPACK libraries:
+-
+-ACX_BLAS([], [AC_MSG_ERROR([BLAS library not found])])
+-ACX_LAPACK([], [AC_MSG_ERROR([LAPACK library not found])])
++sinclude(acx_blas.m4)
++ACX_BLAS
++if test x"$BLAS_LIBS" = x ; then
++ AC_MSG_ERROR([BLAS library not found])
++fi
++sinclude(acx_lapack.m4)
++ACX_LAPACK
++if test x"$LAPACK_LIBS" = x ; then
++ AC_MSG_ERROR([LAPACK library not found])
++fi
+
+ LIBS="$LAPACK_LIBS $BLAS_LIBS $LIBS $FLIBS"
+
diff --git a/sci-physics/harminv/harminv-1.3.1.ebuild b/sci-physics/harminv/harminv-1.3.1.ebuild
index 1e0e939f6..3f9158078 100644
--- a/sci-physics/harminv/harminv-1.3.1.ebuild
+++ b/sci-physics/harminv/harminv-1.3.1.ebuild
@@ -13,21 +13,26 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
-DEPEND="virtual/lapack"
+RDEPEND="virtual/lapack"
+DEPEND="${RDEPEND}
+ dev-util/pkgconfig"
src_unpack() {
unpack ${A}
cd "${S}"
- # --enable-shared gave text realloc on amd64
- # autoreconf with latest which seems ok.
- sed -i \
- -e 's/SHARED(no)/SHARED(yes)/' \
- configure.ac || die "sed failed"
- # eautoreconf does not like it.
- autoreconf -fi || die "autoreconf failed"
+ epatch "${FILESDIR}"/${P}-configure.ac.patch
+ eautoreconf
+}
+
+src_compile() {
+ econf \
+ --with-blas="$(pkg-config --libs blas)" \
+ --with-lapack="$(pkg-config --libs lapack)" \
+ || die "econf failed"
+ emake || die "emake failed"
}
src_install() {
emake DESTDIR="${D}" install || die "emake install failed"
- dodoc AUTHORS COPYRIGHT NEWS README
+ dodoc AUTHORS COPYRIGHT NEWS README || die "dodoc failed"
}
diff --git a/sci-physics/meep/Manifest b/sci-physics/meep/Manifest
index 3d4cd5ac6..0d4ada68a 100644
--- a/sci-physics/meep/Manifest
+++ b/sci-physics/meep/Manifest
@@ -1,8 +1,12 @@
+AUX meep-0.10-configure.ac.patch 383 RMD160 71c9e7bac1b7848cb9554e842c7a740a7c0e59d5 SHA1 ce5c9f8cf36f0798b5ccd8a2696913b269963d9d SHA256 ef296514f6b193ea0e4e30fc439ef5e008d6059c9b321cf8ea13920cfd3633d1
+MD5 52e3c3460df274f01a407f73486e1ebb files/meep-0.10-configure.ac.patch 383
+RMD160 71c9e7bac1b7848cb9554e842c7a740a7c0e59d5 files/meep-0.10-configure.ac.patch 383
+SHA256 ef296514f6b193ea0e4e30fc439ef5e008d6059c9b321cf8ea13920cfd3633d1 files/meep-0.10-configure.ac.patch 383
DIST meep-0.10.tar.gz 882349 RMD160 6e3296f5fad63436a20e6d8d7db4d8d301882148 SHA1 54bc916e6a93f1b21c9d88f28a1f3f8efe437254 SHA256 7e9eac470220ba554e448b8aa4fe0458959e2974475ddf1541aeb2e45f8895e8
-EBUILD meep-0.10.ebuild 1180 RMD160 215f45b2de120d5e9a6a30ca48c758a9fa4fbca0 SHA1 c6a7357d52e2feb20a855cb7d2dbae06d1d7f1e7 SHA256 3482ee81aef5294e9e32880e63897eb8b03a452ad3491fbbfd44958a9c13a18b
-MD5 6547f47f11389e1580fe9fb3ab6cef22 meep-0.10.ebuild 1180
-RMD160 215f45b2de120d5e9a6a30ca48c758a9fa4fbca0 meep-0.10.ebuild 1180
-SHA256 3482ee81aef5294e9e32880e63897eb8b03a452ad3491fbbfd44958a9c13a18b meep-0.10.ebuild 1180
+EBUILD meep-0.10.ebuild 1109 RMD160 2f13b4726f83fe46861c3af131fed3bd70930ec0 SHA1 1ceedc46a6d267eeae30669eea70298e10b83135 SHA256 18009432b07a9d06e4abec5b58ba0eb88d354177edcf32df7c19d9b5906a0e16
+MD5 aec5d240fd25ee445982abab9f2e4103 meep-0.10.ebuild 1109
+RMD160 2f13b4726f83fe46861c3af131fed3bd70930ec0 meep-0.10.ebuild 1109
+SHA256 18009432b07a9d06e4abec5b58ba0eb88d354177edcf32df7c19d9b5906a0e16 meep-0.10.ebuild 1109
MISC ChangeLog 330 RMD160 b2f42ecd6385a0bbb5a03a0ba0247ba8f0c4dab9 SHA1 14cfb32530de0c7e88d0309075202ccb60acda0b SHA256 dde6e64f667de1f10305dc6c8e3eeaadbcf12010b166eecaf56e043ad2fc423e
MD5 a49b9c0ea6102f03a581581b720a11c8 ChangeLog 330
RMD160 b2f42ecd6385a0bbb5a03a0ba0247ba8f0c4dab9 ChangeLog 330
diff --git a/sci-physics/meep/files/meep-0.10-configure.ac.patch b/sci-physics/meep/files/meep-0.10-configure.ac.patch
new file mode 100644
index 000000000..2097b2093
--- /dev/null
+++ b/sci-physics/meep/files/meep-0.10-configure.ac.patch
@@ -0,0 +1,11 @@
+--- configure.ac.orig 2007-09-27 09:44:17.206142973 +0100
++++ configure.ac 2007-09-27 09:45:17.825597479 +0100
+@@ -11,7 +11,7 @@
+ AM_CONFIG_HEADER(config.h)
+ AM_MAINTAINER_MODE
+ AC_SUBST(SHARED_VERSION_INFO)
+-AM_ENABLE_SHARED(no) dnl shared libs cause too many headaches to be default
++#AM_ENABLE_SHARED(no) dnl shared libs cause too many headaches to be default
+
+ MEEP_SUFFIX=""
+
diff --git a/sci-physics/meep/meep-0.10.ebuild b/sci-physics/meep/meep-0.10.ebuild
index 15c46228b..d3debfd33 100644
--- a/sci-physics/meep/meep-0.10.ebuild
+++ b/sci-physics/meep/meep-0.10.ebuild
@@ -23,13 +23,8 @@ DEPEND="sci-libs/fftw
src_unpack() {
unpack ${A}
cd "${S}"
- # --enable-shared gave text realloc on amd64
- # autoreconf with latest which seems ok.
- sed -i \
- -e 's/SHARED(no)/SHARED(yes)/' \
- configure.ac || die "sed failed"
- # eautoreconf gives errors
- autoreconf -fi || die "autoreconf failed"
+ epatch "${FILESDIR}"/${P}-configure.ac.patch
+ AT_M4DIR="m4" eautoreconf
}
src_compile() {
@@ -42,9 +37,9 @@ src_compile() {
}
src_install() {
- emake install DESTDIR=${D} || die "emake install failed"
- dodoc AUTHORS COPYRIGHT NEWS README TODO
+ emake install DESTDIR="${D}" || die "emake install failed"
+ dodoc AUTHORS COPYRIGHT NEWS README TODO || die "dodoc failed"
insinto /usr/share/doc/${PF}
- use doc && doins doc/meep.pdf
- use examples && doins -r examples
+ use doc && { doins doc/meep.pdf || die "install doc failed"; }
+ use examples && { doins -r examples || die "install examples failed"; }
}