summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Goller <morfic@gentoo.org>2004-09-17 03:34:54 +0000
committerDaniel Goller <morfic@gentoo.org>2004-09-17 03:34:54 +0000
commit63880f5f7628857dee75713bca46f8becc480b7f (patch)
tree49c82f1a52b15ef8cafa497905e02a17c67c538f /app-misc/mmv
parentnew snapshot. among other things it fixes a bug with pthreads.h being unable ... (diff)
downloadgentoo-2-63880f5f7628857dee75713bca46f8becc480b7f.tar.gz
gentoo-2-63880f5f7628857dee75713bca46f8becc480b7f.tar.bz2
gentoo-2-63880f5f7628857dee75713bca46f8becc480b7f.zip
closing bug 62771, fixed for gcc3.4
Diffstat (limited to 'app-misc/mmv')
-rw-r--r--app-misc/mmv/ChangeLog6
-rw-r--r--app-misc/mmv/files/mmv-gcc34.patch13
-rw-r--r--app-misc/mmv/mmv-1.01b.ebuild11
3 files changed, 27 insertions, 3 deletions
diff --git a/app-misc/mmv/ChangeLog b/app-misc/mmv/ChangeLog
index 97e0c759168b..730df7767546 100644
--- a/app-misc/mmv/ChangeLog
+++ b/app-misc/mmv/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-misc/mmv
# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/mmv/ChangeLog,v 1.8 2004/06/24 22:24:54 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mmv/ChangeLog,v 1.9 2004/09/17 03:34:54 morfic Exp $
+
+ 16 Sep 2004; Daniel Goller <morfic@gentoo.org> mmv-1.01b.ebuild:
+ applied patch for gcc3.4, closing bug 62711
+ Thanks to autovoicer Magnade for the patch
14 Jun 2004; Daniel Ahlberg <aliz@gentoo.org> mmv-1.01b.ebuild:
Unmasked on amd64.
diff --git a/app-misc/mmv/files/mmv-gcc34.patch b/app-misc/mmv/files/mmv-gcc34.patch
new file mode 100644
index 000000000000..5eb44462488f
--- /dev/null
+++ b/app-misc/mmv/files/mmv-gcc34.patch
@@ -0,0 +1,13 @@
+--- mmv-1.01b.orig/mmv.c.old 2004-09-16 19:54:13.775133568 -0700
++++ mmv-1.01b.orig/mmv.c 2004-09-16 19:56:34.161791552 -0700
+@@ -127,10 +127,6 @@
+ #include <sys/stat.h>
+ #include <sys/file.h>
+
+-extern char *getenv();
+-extern long lseek();
+-extern char *malloc();
+-
+ #ifdef HAS_DIRENT
+ #include <dirent.h>
+ typedef struct dirent DIRENTRY;
diff --git a/app-misc/mmv/mmv-1.01b.ebuild b/app-misc/mmv/mmv-1.01b.ebuild
index 5781eace63dd..c0533446a90b 100644
--- a/app-misc/mmv/mmv-1.01b.ebuild
+++ b/app-misc/mmv/mmv-1.01b.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/mmv/mmv-1.01b.ebuild,v 1.9 2004/06/24 22:24:54 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mmv/mmv-1.01b.ebuild,v 1.10 2004/09/17 03:34:54 morfic Exp $
-inherit eutils
+inherit eutils gcc
DESCRIPTION="Move/copy/append/link multiple files according to a set of wildcard patterns."
HOMEPAGE="http://packages.debian.org/unstable/utils/mmv.html"
@@ -23,6 +23,13 @@ S=${WORKDIR}/${P}.orig
src_unpack() {
unpack ${P/-/_}.orig.tar.gz
epatch ${DISTDIR}/${P/-/_}-${PATCH_DEB_VER}.diff.gz
+
+ #apply both patches to compile with gcc-3.4 closing bug #62711
+ if [ "`gcc-major-version`" -ge "3" -a "`gcc-minor-version`" -ge "4" ]
+ then
+ epatch ${FILESDIR}/mmv-gcc34.patch
+ fi
+
}
src_compile() {