summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys-devel/dev86/ChangeLog9
-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
3 files changed, 21 insertions, 4 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/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)