diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-04-18 23:28:58 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-04-18 23:28:58 +0000 |
| commit | 4244d6973523b0ebcbb115a5837b4290cff7a88c (patch) | |
| tree | 679bd37170c7bc42f2f7cfe3573abb3eb98c92d9 | |
| parent | Stable on SPARC wrt bug #106051. (diff) | |
| download | gentoo-2-4244d6973523b0ebcbb115a5837b4290cff7a88c.tar.gz gentoo-2-4244d6973523b0ebcbb115a5837b4290cff7a88c.tar.bz2 gentoo-2-4244d6973523b0ebcbb115a5837b4290cff7a88c.zip | |
Add patch to build with GCC 4 and mark ~amd64.
(Portage version: 2.1_pre7-r5)
| -rw-r--r-- | sys-apps/mtree/ChangeLog | 8 | ||||
| -rw-r--r-- | sys-apps/mtree/files/mtree-1.5-gcc4.patch | 29 | ||||
| -rw-r--r-- | sys-apps/mtree/mtree-1.5.ebuild | 13 |
3 files changed, 46 insertions, 4 deletions
diff --git a/sys-apps/mtree/ChangeLog b/sys-apps/mtree/ChangeLog index 1d425683ce15..35b4a8733906 100644 --- a/sys-apps/mtree/ChangeLog +++ b/sys-apps/mtree/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-apps/mtree -# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/mtree/ChangeLog,v 1.5 2004/06/24 22:18:35 agriffis Exp $ +# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/mtree/ChangeLog,v 1.6 2006/04/18 23:28:58 flameeyes Exp $ + + 18 Apr 2006; Diego Pettenò <flameeyes@gentoo.org> + +files/mtree-1.5-gcc4.patch, mtree-1.5.ebuild: + Add patch to build with GCC 4 and mark ~amd64. 07 May 2004; David Holm <dholm@gentoo.org> mtree-1.5.ebuild: Added to ~ppc. diff --git a/sys-apps/mtree/files/mtree-1.5-gcc4.patch b/sys-apps/mtree/files/mtree-1.5-gcc4.patch new file mode 100644 index 000000000000..a57feed85085 --- /dev/null +++ b/sys-apps/mtree/files/mtree-1.5-gcc4.patch @@ -0,0 +1,29 @@ +Index: bootstrap-pkgsrc/digest/sha2.h +=================================================================== +--- bootstrap-pkgsrc.orig/digest/sha2.h ++++ bootstrap-pkgsrc/digest/sha2.h +@@ -99,21 +99,21 @@ void SHA256_Init(SHA256_CTX *); + void SHA256_Update(SHA256_CTX*, const u_int8_t*, size_t); + void SHA256_Final(u_int8_t[SHA256_DIGEST_LENGTH], SHA256_CTX*); + char* SHA256_End(SHA256_CTX*, u_char *); +-char* SHA256_Data(const u_int8_t*, size_t, u_char *); ++char* SHA256_Data(const u_char*, size_t, u_char *); + char *SHA256_File(char *, char *); + + void SHA384_Init(SHA384_CTX*); + void SHA384_Update(SHA384_CTX*, const u_int8_t*, size_t); + void SHA384_Final(u_int8_t[SHA384_DIGEST_LENGTH], SHA384_CTX*); + char* SHA384_End(SHA384_CTX*, char[SHA384_DIGEST_STRING_LENGTH]); +-char* SHA384_Data(const u_int8_t*, size_t, char[SHA384_DIGEST_STRING_LENGTH]); ++char* SHA384_Data(const u_char*, size_t, char[SHA384_DIGEST_STRING_LENGTH]); + char *SHA384_File(char *, char *); + + void SHA512_Init(SHA512_CTX*); + void SHA512_Update(SHA512_CTX*, const u_int8_t*, size_t); + void SHA512_Final(u_int8_t[SHA512_DIGEST_LENGTH], SHA512_CTX*); + char* SHA512_End(SHA512_CTX*, char[SHA512_DIGEST_STRING_LENGTH]); +-char* SHA512_Data(const u_int8_t*, size_t, char[SHA512_DIGEST_STRING_LENGTH]); ++char* SHA512_Data(const u_char*, size_t, char[SHA512_DIGEST_STRING_LENGTH]); + char *SHA512_File(char *, char *); + + #endif /* SHA2_USE_INTTYPES_H */ diff --git a/sys-apps/mtree/mtree-1.5.ebuild b/sys-apps/mtree/mtree-1.5.ebuild index fcb2dd32e5bf..645f997e8936 100644 --- a/sys-apps/mtree/mtree-1.5.ebuild +++ b/sys-apps/mtree/mtree-1.5.ebuild @@ -1,6 +1,8 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/mtree/mtree-1.5.ebuild,v 1.6 2006/04/18 23:07:19 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/mtree/mtree-1.5.ebuild,v 1.7 2006/04/18 23:28:58 flameeyes Exp $ + +inherit eutils DESCRIPTION="check the permissions of a file system against a spec file" HOMEPAGE="http://www.netbsd.org/" @@ -8,12 +10,19 @@ SRC_URI="ftp://ftp.netbsd.org/pub/NetBSD/packages/bootstrap-pkgsrc.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="~ppc s390 ~x86" +KEYWORDS="~amd64 ~ppc s390 ~x86" IUSE="" DEPEND="" S=${WORKDIR}/bootstrap-pkgsrc +src_unpack() { + unpack ${A} + cd "${S}" + + epatch "${FILESDIR}/${P}-gcc4.patch" +} + src_compile() { cd digest chmod +x configure |