summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wendler <polynomial-c@gentoo.org>2010-10-24 22:07:49 +0000
committerLars Wendler <polynomial-c@gentoo.org>2010-10-24 22:07:49 +0000
commit361538900b645072b154dad9c78460b05d9bd53c (patch)
tree2c6526a2c08dc9129b4147f4bbce53242ee6bfe5 /sys-devel
parent~x86 keyworded per bug 342443 (diff)
downloadhistorical-361538900b645072b154dad9c78460b05d9bd53c.tar.gz
historical-361538900b645072b154dad9c78460b05d9bd53c.tar.bz2
historical-361538900b645072b154dad9c78460b05d9bd53c.zip
Fixed compilation with make-3.82 (bug #336544).
Package-Manager: portage-2.2.0_alpha1/cvs/Linux x86_64
Diffstat (limited to 'sys-devel')
-rw-r--r--sys-devel/dev86/ChangeLog9
-rw-r--r--sys-devel/dev86/Manifest5
-rw-r--r--sys-devel/dev86/dev86-0.16.17-r6.ebuild5
-rw-r--r--sys-devel/dev86/files/dev86-0.16.17-make382.patch11
4 files changed, 24 insertions, 6 deletions
diff --git a/sys-devel/dev86/ChangeLog b/sys-devel/dev86/ChangeLog
index ac71aa77ed32..183e5faeeb7b 100644
--- a/sys-devel/dev86/ChangeLog
+++ b/sys-devel/dev86/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for sys-devel/dev86
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/dev86/ChangeLog,v 1.16 2009/11/09 12:46:38 maekke Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/dev86/ChangeLog,v 1.17 2010/10/24 22:07:49 polynomial-c Exp $
+
+ 24 Oct 2010; Lars Wendler <polynomial-c@gentoo.org>
+ dev86-0.16.17-r6.ebuild, +files/dev86-0.16.17-make382.patch:
+ Fixed compilation with make-3.82 (bug #336544). Patch kindly provided by
+ upstream.
09 Nov 2009; Markus Meier <maekke@gentoo.org> dev86-0.16.17-r6.ebuild:
amd64 stable, bug #289014
diff --git a/sys-devel/dev86/Manifest b/sys-devel/dev86/Manifest
index f850c67d11f9..fa3ad8d70dd2 100644
--- a/sys-devel/dev86/Manifest
+++ b/sys-devel/dev86/Manifest
@@ -1,6 +1,7 @@
AUX dev86-0.16.17-fortify.patch 658 RMD160 6f5e67311af5b9dee3603d31dee8efe01e6544ba SHA1 8933a7789637a20a31bbe9e0b4fd3914c18a8fdc SHA256 8f03870ef8e769d0d112f992f7d911e946e54579c1e214495abf9cd2f126b626
+AUX dev86-0.16.17-make382.patch 299 RMD160 4edcd60bbdb50e5c47957e35dc9695611c185cc4 SHA1 58eb8869b13dc11a7d3a0c889940a6ce23933cfc SHA256 782d221b2e829a29e4d056d1d52b7c6d0b1ccfc21fc7ce7c07416a28a64303ef
AUX dev86-pic.patch 546 RMD160 0e2fb431bf1175f8194ea7c26eeb60ffc84fd619 SHA1 ea618f125232cbcf0762a2e21cb39a73d136f890 SHA256 d1859e3409a70a6b78bdf7ef6664421b1ce272b068836b8fb93b5fce1b20d440
DIST Dev86src-0.16.17.tar.gz 703028 RMD160 b603d2cce807cd20b09695d14538cae8ab8cc371 SHA1 0bfe55c7a5e11d72f19f26cb0383178605951c72 SHA256 52ed4980c0e4b68d2624aadb0ceb0339cb3fd8dd7c2175419d4f77a451846cbe
-EBUILD dev86-0.16.17-r6.ebuild 1531 RMD160 68aa087645838a254a20b85ce1756160bcaf27f5 SHA1 522fe4852aead5ee55a44440fff413373712de88 SHA256 10bd585aee60221a12898996e14be8e51502c44ec7bdd86cf707befcda59102a
-MISC ChangeLog 2421 RMD160 5aca659c192663e71164f33157c7d4cc3d48d364 SHA1 26785ee52c9645b8b46d15303439b314409ce833 SHA256 1ead8c543463d277c86242e5356a4fc9ef7889ce7a44a8b0063187a2118d1a80
+EBUILD dev86-0.16.17-r6.ebuild 1578 RMD160 55fbb98cec9a9551d370d06b0e2819cd7d9db0c8 SHA1 78a1c0ed4bf7a28b4a22a2ab6c174b298ac47862 SHA256 0f8f5ba8b829293308f198a1bee577139958b65cf435805365a88c49584cdfec
+MISC ChangeLog 2632 RMD160 2954e2b6de7045d6ff895e6f4454f1a79d172e0a SHA1 d1b58f440c7e48d46a05922d4d54e94939f56ba0 SHA256 5942a126a445a932114af3881f761999a9b1ddabb7eda205374a0bcb23aa3b31
MISC metadata.xml 504 RMD160 a46289d6edaf6fd964c08c12b3b5ca2feeea1d9b SHA1 c2b3ac646756b5bce01ccd06b5bbae67e16644a5 SHA256 086eca0f8e4a848c0c449fada987616928386aff4a829b656a80f27e2a5b3267
diff --git a/sys-devel/dev86/dev86-0.16.17-r6.ebuild b/sys-devel/dev86/dev86-0.16.17-r6.ebuild
index 22bc5eb923d8..e2c6dbf0b6e0 100644
--- a/sys-devel/dev86/dev86-0.16.17-r6.ebuild
+++ b/sys-devel/dev86/dev86-0.16.17-r6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/dev86/dev86-0.16.17-r6.ebuild,v 1.4 2009/11/09 12:46:38 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/dev86/dev86-0.16.17-r6.ebuild,v 1.5 2010/10/24 22:07:49 polynomial-c Exp $
inherit eutils
@@ -30,6 +30,7 @@ src_unpack() {
cd "${S}"
epatch "${FILESDIR}"/dev86-pic.patch
epatch "${FILESDIR}"/${P}-fortify.patch
+ epatch "${FILESDIR}"/${P}-make382.patch
sed -i \
-e "s:-O2 -g:${CFLAGS} ${CPPFLAGS}:" \
-e '/INEXE=/s:-s::' \
diff --git a/sys-devel/dev86/files/dev86-0.16.17-make382.patch b/sys-devel/dev86/files/dev86-0.16.17-make382.patch
new file mode 100644
index 000000000000..e7ce0651c6b3
--- /dev/null
+++ b/sys-devel/dev86/files/dev86-0.16.17-make382.patch
@@ -0,0 +1,11 @@
+--- libc/i386sys/Makefile
++++ libc/i386sys/Makefile
+@@ -12,7 +12,7 @@
+ DOBJ=opendir.o closedir.o readdir.o
+
+ ifeq ($(LIB_CPU)-$(LIB_OS),i386-ELKS)
+-OBJ=$(LOBJ3) $(LOBJ) $(EOBJ) $(DOBJ) setjmp3.o
++OBJ=$(LOBJ) $(LOBJ) $(EOBJ) $(DOBJ) setjmp3.o
+ SYSCALLS=syscalls
+
+ CFLAGS=$(ARCH) $(CCFLAGS) $(DEFS)