summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Loeser <halcy0n@gentoo.org>2009-07-25 20:48:41 +0000
committerMark Loeser <halcy0n@gentoo.org>2009-07-25 20:48:41 +0000
commite2ed26c1544647f29dc901c37382587b5689f500 (patch)
tree1e8beff113b1df40a01a440533f6e1e579539c1c /sys-apps/rename
parentFix compilation with gcc-4.4; bug #273839 (diff)
downloadgentoo-2-e2ed26c1544647f29dc901c37382587b5689f500.tar.gz
gentoo-2-e2ed26c1544647f29dc901c37382587b5689f500.tar.bz2
gentoo-2-e2ed26c1544647f29dc901c37382587b5689f500.zip
Fix compilation with gcc-4.4. Patch by Vistor Ostorga <vostorga AT gentoo DOT org>; bug #274012
(Portage version: 2.2_rc33-r1/cvs/Linux i686)
Diffstat (limited to 'sys-apps/rename')
-rw-r--r--sys-apps/rename/ChangeLog9
-rw-r--r--sys-apps/rename/files/rename-1.3-gcc44.patch16
-rw-r--r--sys-apps/rename/rename-1.3.ebuild5
3 files changed, 26 insertions, 4 deletions
diff --git a/sys-apps/rename/ChangeLog b/sys-apps/rename/ChangeLog
index 0315220ac527..10b39c25d1a2 100644
--- a/sys-apps/rename/ChangeLog
+++ b/sys-apps/rename/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for sys-apps/rename
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/rename/ChangeLog,v 1.18 2008/10/12 18:22:28 armin76 Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/rename/ChangeLog,v 1.19 2009/07/25 20:48:41 halcy0n Exp $
+
+ 25 Jul 2009; Mark Loeser <halcy0n@gentoo.org> rename-1.3.ebuild,
+ +files/rename-1.3-gcc44.patch:
+ Fix compilation with gcc-4.4. Patch by Vistor Ostorga <vostorga AT gentoo
+ DOT org>; bug #274012
12 Oct 2008; Raúl Porcel <armin76@gentoo.org> rename-1.3.ebuild:
ia64/sparc stable
diff --git a/sys-apps/rename/files/rename-1.3-gcc44.patch b/sys-apps/rename/files/rename-1.3-gcc44.patch
new file mode 100644
index 000000000000..0cbd3966748b
--- /dev/null
+++ b/sys-apps/rename/files/rename-1.3-gcc44.patch
@@ -0,0 +1,16 @@
+diff -NrU5 rename-1.3.original/rename.c rename-1.3/rename.c
+--- rename-1.3.original/rename.c 2009-06-14 00:21:43.000000000 -0600
++++ rename-1.3/rename.c 2009-06-14 00:22:21.000000000 -0600
+@@ -63,11 +63,11 @@
+ #endif
+ #endif
+
+ #if HAVE_REGEX_H
+ #include <regex.h>
+-#elif
++#else
+ #include "regex.h"
+ #endif
+
+ #if HAVE_GETOPT_H
+ #include <getopt.h>
diff --git a/sys-apps/rename/rename-1.3.ebuild b/sys-apps/rename/rename-1.3.ebuild
index c0cdce8160c6..e6f5a20c0060 100644
--- a/sys-apps/rename/rename-1.3.ebuild
+++ b/sys-apps/rename/rename-1.3.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/sys-apps/rename/rename-1.3.ebuild,v 1.22 2008/10/12 18:22:28 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/rename/rename-1.3.ebuild,v 1.23 2009/07/25 20:48:41 halcy0n Exp $
inherit toolchain-funcs eutils
@@ -22,6 +22,7 @@ src_unpack() {
Makefile.in
epatch "${FILESDIR}"/${P}-rename.patch
epatch "${FILESDIR}"/${P}-build.patch
+ epatch "${FILESDIR}"/${P}-gcc44.patch
tc-export CC
}