summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Hill <dirtyepic@gentoo.org>2009-05-15 22:49:32 +0000
committerRyan Hill <dirtyepic@gentoo.org>2009-05-15 22:49:32 +0000
commit8fea794ab0ee7c2b9dc1790c0061cbabaf57ebc5 (patch)
treea56e5d501f03823be5942fd28b7aee0cd6eff426 /app-portage
parentstable sparc, bug 269203 (diff)
downloadgentoo-2-8fea794ab0ee7c2b9dc1790c0061cbabaf57ebc5.tar.gz
gentoo-2-8fea794ab0ee7c2b9dc1790c0061cbabaf57ebc5.tar.bz2
gentoo-2-8fea794ab0ee7c2b9dc1790c0061cbabaf57ebc5.zip
Fix building with GCC 4.4. Patch from Martin Väth in bug #269252.
(Portage version: 2.2_rc33/cvs/Linux x86_64)
Diffstat (limited to 'app-portage')
-rw-r--r--app-portage/deltup/ChangeLog8
-rw-r--r--app-portage/deltup/deltup-0.4.4.ebuild5
-rw-r--r--app-portage/deltup/files/deltup-0.4.4-gcc44.patch11
3 files changed, 20 insertions, 4 deletions
diff --git a/app-portage/deltup/ChangeLog b/app-portage/deltup/ChangeLog
index f55ec281b065..5a1864f7588e 100644
--- a/app-portage/deltup/ChangeLog
+++ b/app-portage/deltup/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-portage/deltup
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/deltup/ChangeLog,v 1.18 2008/06/17 14:07:54 drac Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-portage/deltup/ChangeLog,v 1.19 2009/05/15 22:49:31 dirtyepic Exp $
+
+ 15 May 2009; Ryan Hill <dirtyepic@gentoo.org> deltup-0.4.4.ebuild,
+ +files/deltup-0.4.4-gcc44.patch:
+ Fix building with GCC 4.4. Patch from Martin Väth in bug #269252.
17 Jun 2008; Samuli Suominen <drac@gentoo.org> deltup-0.4.4.ebuild:
Fix xdelta dep. from >=1.1.3 to =1* wrt #206006.
diff --git a/app-portage/deltup/deltup-0.4.4.ebuild b/app-portage/deltup/deltup-0.4.4.ebuild
index 8eec99d12996..4ec933e63b2e 100644
--- a/app-portage/deltup/deltup-0.4.4.ebuild
+++ b/app-portage/deltup/deltup-0.4.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/deltup/deltup-0.4.4.ebuild,v 1.5 2008/06/17 14:07:54 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/deltup/deltup-0.4.4.ebuild,v 1.6 2009/05/15 22:49:31 dirtyepic Exp $
inherit eutils toolchain-funcs flag-o-matic
@@ -28,6 +28,7 @@ src_unpack () {
epatch "${FILESDIR}"/bzip2-1.0.2-makefile-CFLAGS.patch
cd "${S}"
epatch "${FILESDIR}"/gcc-4.3-compile.fix
+ epatch "${FILESDIR}"/${P}-gcc44.patch
}
src_compile () {
diff --git a/app-portage/deltup/files/deltup-0.4.4-gcc44.patch b/app-portage/deltup/files/deltup-0.4.4-gcc44.patch
new file mode 100644
index 000000000000..05c318fa1fd0
--- /dev/null
+++ b/app-portage/deltup/files/deltup-0.4.4-gcc44.patch
@@ -0,0 +1,11 @@
+diff -u deltup-0.4.4-orig/file.h deltup-0.4.4/file.h
+--- deltup-0.4.4-orig/file.h 2009-05-15 16:46:25.071923990 -0600
++++ deltup-0.4.4/file.h 2009-05-15 16:47:22.214931273 -0600
+@@ -13,6 +13,7 @@
+ */
+ #include <cstring>
+ #include <cstdlib>
++#include <cstdio>
+
+ class IStream {
+ public: