summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTravis Tilley <lv@gentoo.org>2004-04-27 03:03:09 +0000
committerTravis Tilley <lv@gentoo.org>2004-04-27 03:03:09 +0000
commit9e4d4d7b02ccdd7710119c39daacde40ecd4174d (patch)
tree5d9c0654e657087b4652bf89dd517d79e43d73c6 /app-arch
parentMarked stable on s390 (diff)
downloadhistorical-9e4d4d7b02ccdd7710119c39daacde40ecd4174d.tar.gz
historical-9e4d4d7b02ccdd7710119c39daacde40ecd4174d.tar.bz2
historical-9e4d4d7b02ccdd7710119c39daacde40ecd4174d.zip
gcc 3.4 fix
Diffstat (limited to 'app-arch')
-rw-r--r--app-arch/ncompress/ChangeLog6
-rw-r--r--app-arch/ncompress/Manifest5
-rw-r--r--app-arch/ncompress/files/ncompress-gcc34.patch23
-rw-r--r--app-arch/ncompress/ncompress-4.2.4.ebuild7
4 files changed, 37 insertions, 4 deletions
diff --git a/app-arch/ncompress/ChangeLog b/app-arch/ncompress/ChangeLog
index f60569c7d10e..d2b8416db795 100644
--- a/app-arch/ncompress/ChangeLog
+++ b/app-arch/ncompress/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-arch/ncompress
# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/ncompress/ChangeLog,v 1.10 2004/03/05 18:08:54 iggy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/ncompress/ChangeLog,v 1.11 2004/04/27 03:03:09 lv Exp $
+
+ 26 Apr 2004; Travis Tilley <lv@gentoo.org> +files/ncompress-gcc34.patch,
+ ncompress-4.2.4.ebuild:
+ gcc 3.4 fix
02 Mar 2004; Brian Jackson <iggy@gentoo.org> ncompress-4.2.4.ebuild:
adding initial s390 support
diff --git a/app-arch/ncompress/Manifest b/app-arch/ncompress/Manifest
index 2a925be7e529..9c99f07c5f54 100644
--- a/app-arch/ncompress/Manifest
+++ b/app-arch/ncompress/Manifest
@@ -1,3 +1,4 @@
-MD5 e5a1903c2fa1c8708f2683d9eb132359 ChangeLog 1298
-MD5 309ac8fa85590b1e5ea4cf3ff9589c19 ncompress-4.2.4.ebuild 764
+MD5 9be32ecbb829734784c0c68a1d237b16 ChangeLog 1412
+MD5 8cad7a3bb3f41bd0a4d420749bafd0ef ncompress-4.2.4.ebuild 845
MD5 44e597943ff90e32aacebcd702147801 files/digest-ncompress-4.2.4 66
+MD5 e6539b304d089dd57b63d364379500b7 files/ncompress-gcc34.patch 915
diff --git a/app-arch/ncompress/files/ncompress-gcc34.patch b/app-arch/ncompress/files/ncompress-gcc34.patch
new file mode 100644
index 000000000000..0ed2ebfa5e2c
--- /dev/null
+++ b/app-arch/ncompress/files/ncompress-gcc34.patch
@@ -0,0 +1,23 @@
+--- ncompress-4.2.4/compress42.c 1992-10-28 06:10:53.000000000 -0500
++++ ../compress42.c 2004-04-13 16:57:11.325373656 -0400
+@@ -171,9 +171,9 @@
+ #ifndef NOFUNCDEF
+ extern void *malloc LARGS((int));
+ extern void free LARGS((void *));
+-#ifndef _IBMR2
++/* #ifndef _IBMR2
+ extern int open LARGS((char const *,int,...));
+-#endif
++#endif */
+ extern int close LARGS((int));
+ extern int read LARGS((int,void *,int));
+ extern int write LARGS((int,void const *,int));
+@@ -184,7 +184,7 @@
+ extern char *strcpy LARGS((char *,char const *));
+ extern char *strcat LARGS((char *,char const *));
+ extern int strcmp LARGS((char const *,char const *));
+- extern unsigned strlen LARGS((char const *));
++/* extern unsigned strlen LARGS((char const *)); */
+ extern void *memset LARGS((void *,char,unsigned int));
+ extern void *memcpy LARGS((void *,void const *,unsigned int));
+ extern int atoi LARGS((char const *));
diff --git a/app-arch/ncompress/ncompress-4.2.4.ebuild b/app-arch/ncompress/ncompress-4.2.4.ebuild
index 3bf869f72768..d1dd8de726f0 100644
--- a/app-arch/ncompress/ncompress-4.2.4.ebuild
+++ b/app-arch/ncompress/ncompress-4.2.4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/ncompress/ncompress-4.2.4.ebuild,v 1.22 2004/03/02 16:57:48 iggy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/ncompress/ncompress-4.2.4.ebuild,v 1.23 2004/04/27 03:03:09 lv Exp $
DESCRIPTION="Another uncompressor for compatibility"
SRC_URI="ftp://ftp.leo.org/pub/comp/os/unix/linux/sunsite/utils/compress/${P}.tar.gz"
@@ -10,6 +10,11 @@ SLOT="0"
LICENSE="public-domain"
KEYWORDS="amd64 x86 ppc sparc alpha mips hppa ia64 ppc64 s390"
+src_unpack() {
+ unpack ${A}
+ cd ${S} ; epatch ${FILESDIR}/ncompress-gcc34.patch
+}
+
src_compile() {
sed -e "s:options= :options= ${CFLAGS} :" \
-e "s:CC=cc:CC=${CC:-gcc}:" Makefile.def > Makefile