aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2010-06-17 14:52:37 +0200
committerJustin Lecher <jlec@gentoo.org>2010-06-17 14:52:37 +0200
commita0a7f90224e419ab8bc68ff51331ab17bafce130 (patch)
treef1316c75605418027bb84b5e5219fd7302a822d6 /dev-cpp/growler-link
parentInCvs as sci-libs/punc (diff)
downloadsci-a0a7f90224e419ab8bc68ff51331ab17bafce130.tar.gz
sci-a0a7f90224e419ab8bc68ff51331ab17bafce130.tar.bz2
sci-a0a7f90224e419ab8bc68ff51331ab17bafce130.zip
Fix for compilation with gcc4.4, #271017
(Portage version: 2.2_rc67/git/Linux x86_64) (Signed Manifest commit)
Diffstat (limited to 'dev-cpp/growler-link')
-rw-r--r--dev-cpp/growler-link/ChangeLog6
-rw-r--r--dev-cpp/growler-link/Manifest15
-rw-r--r--dev-cpp/growler-link/files/0.3.7-gcc4.patch36
-rw-r--r--dev-cpp/growler-link/growler-link-0.3.7.ebuild24
4 files changed, 67 insertions, 14 deletions
diff --git a/dev-cpp/growler-link/ChangeLog b/dev-cpp/growler-link/ChangeLog
index 7212b1489..9dd425490 100644
--- a/dev-cpp/growler-link/ChangeLog
+++ b/dev-cpp/growler-link/ChangeLog
@@ -1,7 +1,11 @@
# ChangeLog for dev-cpp/growler-link
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 17 Jun 2010; Justin Lecher <jlec@gentoo.org> +files/0.3.7-gcc4.patch,
+ growler-link-0.3.7.ebuild:
+ Fix for compilation with gcc4.4, #271017
+
31 Oct 2007; Bryan Green <bryan.d.green@nasa.gov> ChangeLog:
removed CRs from DESCRIPTION
diff --git a/dev-cpp/growler-link/Manifest b/dev-cpp/growler-link/Manifest
index 4d79a5430..fdf5914ab 100644
--- a/dev-cpp/growler-link/Manifest
+++ b/dev-cpp/growler-link/Manifest
@@ -1,4 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX 0.3.7-gcc4.patch 746 RMD160 45ddd21f4a258a0d8561a6a23686c39a294613c2 SHA1 c23af38c7d74fca88916e4661791a0e3530cb771 SHA256 bcd19b7855eb0da6eec9e468c6172ff82db419208508e24268d1408d40729c65
DIST growler-link-0.3.7.tar.gz 548768 RMD160 38153300e2ea8375116804ffe3823e0fabd3a831 SHA1 9384b97e7d9010d4a85c8cfbc26f71f312520943 SHA256 eec2e6f91146bc68004114adc7ee00617eab4b459649029cfcdcfc4db3d17719
-EBUILD growler-link-0.3.7.ebuild 817 RMD160 620672e214542a48c756cf106541b0e60ae24c9a SHA1 ab7afc2eb04fce715e6421a312c21182599cfbc8 SHA256 e2a58f7c98a5c013aaf8406d7f719cfb0dc7d35b17a85b78378ac9e931c1e10d
-MISC ChangeLog 349 RMD160 2d40156198544a346bea4e83b1a31615f5c77aa0 SHA1 a3d96a6fb1bbd0e51a50231dcebc25f35761cf3d SHA256 2237f8162fe35e86fb21f6e39f9d93786d7567fb2f4f754ce643e0f1d1205b33
+EBUILD growler-link-0.3.7.ebuild 819 RMD160 4c43f87eeb860ffa93985b67b604932f2885f664 SHA1 1218e3e4c1d962c5785b0c62545fdaa103412a9a SHA256 298a33cc380fcb5a29527cf01ecc31aff4e551c14081c7e7e552c1f8d26a8e01
+MISC ChangeLog 494 RMD160 d44ae219921b90f8b8223b10839de7d1ca7c084b SHA1 c204157ab73d2267ff7c3269d376b35f126904e8 SHA256 f212ea330473bfd2b699b989ad6a74fee93e3d70173ed0548c988d4e8f38afd2
MISC metadata.xml 481 RMD160 be4b7a9b4472d0c3861813d9f8f3097a00e9577e SHA1 ea067e55e4948b6015acc9c08e3df412ea2c0b12 SHA256 79b99b68b79b06620061d066e89197fff4f24f8b6c8a559bca2d0b6c20752e24
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iEYEARECAAYFAkwaGpQACgkQgAnW8HDreRahtQCgp0NOfTg70NY2OEtWicijthoJ
+QdUAnilXBJJg7sns4o0n3cE/Vueh6OOF
+=b36r
+-----END PGP SIGNATURE-----
diff --git a/dev-cpp/growler-link/files/0.3.7-gcc4.patch b/dev-cpp/growler-link/files/0.3.7-gcc4.patch
new file mode 100644
index 000000000..fcfbf19fb
--- /dev/null
+++ b/dev-cpp/growler-link/files/0.3.7-gcc4.patch
@@ -0,0 +1,36 @@
+diff --git a/lib/buffer.cxx b/lib/buffer.cxx
+index 7b9eda3..12b87ad 100644
+--- a/lib/buffer.cxx
++++ b/lib/buffer.cxx
+@@ -6,6 +6,7 @@
+ */
+
+ #include <cstdio>
++#include <cstring>
+ #include <memory>
+ #include <stdexcept>
+ #include <lib/unistd.h>
+diff --git a/lib/daemon.cxx b/lib/daemon.cxx
+index f289783..78d4883 100644
+--- a/lib/daemon.cxx
++++ b/lib/daemon.cxx
+@@ -18,6 +18,7 @@
+ #include <sys/stat.h>
+ #include <sys/wait.h>
+ #include <pwd.h>
++#include <cstdio>
+
+ #if GR_HAVE_FCNTL_H
+ #include <fcntl.h>
+diff --git a/lib/serialize.h b/lib/serialize.h
+index 8fa68f8..0e08c81 100644
+--- a/lib/serialize.h
++++ b/lib/serialize.h
+@@ -23,6 +23,7 @@
+ #include <streambuf>
+ #include <string>
+ #include <cassert>
++#include <cstdio>
+
+ namespace lib {
+
diff --git a/dev-cpp/growler-link/growler-link-0.3.7.ebuild b/dev-cpp/growler-link/growler-link-0.3.7.ebuild
index 260f182b4..c6c1bf3d0 100644
--- a/dev-cpp/growler-link/growler-link-0.3.7.ebuild
+++ b/dev-cpp/growler-link/growler-link-0.3.7.ebuild
@@ -1,37 +1,39 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-SLOT="0"
-LICENSE="NOSA"
+EAPI="3"
-KEYWORDS="~amd64 ~x86"
+inherit eutils
DESCRIPTION="Growler-Link: the lowest-level Growler library."
HOMEPAGE="http://www.nas.nasa.gov/~bgreen/growler/"
SRC_URI="${HOMEPAGE}/downloads/growler-link-${PV}.tar.gz"
+SLOT="0"
+LICENSE="NOSA"
+KEYWORDS="~amd64 ~x86"
IUSE="doc tcpd static fortran"
RDEPEND=">=dev-libs/boost-1.33.1
tcpd? ( sys-apps/tcp-wrappers )"
-
DEPEND="${RDEPEND}
doc? ( app-doc/doxygen )"
-src_compile() {
+src_prepare() {
+ epatch "${FILESDIR}"/${PV}-gcc4.patch
+}
+
+src_configure() {
econf \
$(use_enable doc) \
$(use_enable tcpd) \
$(use_enable static) \
- $(use_enable fortran) \
- --enable-fast-install \
- || die "could not configure"
- emake || die "emake failed"
+ $(use_enable fortran)
}
src_install() {
emake DESTDIR="${D}" install || die "install failed"
- dodoc README NEWS AUTHORS NOSA ChangeLog
+ dodoc README NEWS AUTHORS NOSA ChangeLog || die
}