From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id CB1E758973 for ; Sat, 6 Feb 2016 10:27:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3089021C002; Sat, 6 Feb 2016 10:27:40 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BAAFF21C002 for ; Sat, 6 Feb 2016 10:27:39 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 384F4340BB0 for ; Sat, 6 Feb 2016 10:27:38 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2C4BB8E1 for ; Sat, 6 Feb 2016 10:27:32 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1454754445.0a4ee8dccd9422cdc4a507c5bdd360be4802f8fd.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/dev86/files/, sys-devel/dev86/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-devel/dev86/dev86-0.16.21-r1.ebuild sys-devel/dev86/files/dev86-0.16.21-non-void-return-clang.patch sys-devel/dev86/files/dev86-pic.patch X-VCS-Directories: sys-devel/dev86/ sys-devel/dev86/files/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 0a4ee8dccd9422cdc4a507c5bdd360be4802f8fd X-VCS-Branch: master Date: Sat, 6 Feb 2016 10:27:32 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 339f80f3-506c-497a-af78-50734321dc60 X-Archives-Hash: d3e96a0b4e433fba1132862d18001520 commit: 0a4ee8dccd9422cdc4a507c5bdd360be4802f8fd Author: David Seifert gentoo org> AuthorDate: Sat Feb 6 10:27:11 2016 +0000 Commit: David Seifert gentoo org> CommitDate: Sat Feb 6 10:27:25 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a4ee8dc sys-devel/dev86: Include patch for building with clang Gentoo-Bug: 523096 * EAPI=6 * Amend patches for -p1 * Thanks Fabio Scaccabarozzi for the patch Package-Manager: portage-2.2.27 sys-devel/dev86/dev86-0.16.21-r1.ebuild | 76 ++++++++++++++++++++++ .../dev86-0.16.21-non-void-return-clang.patch | 15 +++++ sys-devel/dev86/files/dev86-pic.patch | 4 +- 3 files changed, 93 insertions(+), 2 deletions(-) diff --git a/sys-devel/dev86/dev86-0.16.21-r1.ebuild b/sys-devel/dev86/dev86-0.16.21-r1.ebuild new file mode 100644 index 0000000..9942a82 --- /dev/null +++ b/sys-devel/dev86/dev86-0.16.21-r1.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit toolchain-funcs + +DESCRIPTION="Bruce's C compiler - Simple C compiler to generate 8086 code" +HOMEPAGE="http://v3.sk/~lkundrak/dev86/" +SRC_URI="http://v3.sk/~lkundrak/dev86/Dev86src-${PV}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +IUSE="" + +RDEPEND="sys-devel/bin86" +DEPEND="${RDEPEND} + dev-util/gperf" + +STRIP_MASK="/usr/*/bcc/lib*.a /usr/*/i386/libc.a" +PATCHES=( + "${FILESDIR}/${PN}-pic.patch" + "${FILESDIR}/${PN}-0.16.19-fortify.patch" + "${FILESDIR}/${P}-non-void-return-clang.patch" +) + +src_prepare() { + default + + # elksemu doesn't compile under amd64 + if use amd64; then + einfo "Not compiling elksemu on amd64" + sed -i \ + -e 's,alt-libs elksemu,alt-libs,' \ + -e 's,install-lib install-emu,install-lib,' \ + makefile.in || die + fi + + sed -i -e "s:-O2 -g:${CFLAGS}:" -e '/INEXE=/s:-s::' makefile.in || die + sed -i -e "s:/lib/:/$(get_libdir)/:" bcc/bcc.c || die + sed -i -e '/INSTALL_OPTS=/s:-s::' bin86/Makefile || die + sed -i -e '/install -m 755 -s/s:-s::' dis88/Makefile || die +} + +src_compile() { + # Don't mess with CPPFLAGS as they tend to break compilation + # (bug #343655). + unset CPPFLAGS + + # First `make` is also a config, so set all the path vars here + emake -j1 \ + DIST="${D}" \ + CC="$(tc-getCC)" \ + LIBDIR="/usr/$(get_libdir)/bcc" \ + INCLDIR="/usr/$(get_libdir)/bcc" + + export PATH=${S}/bin:${PATH} + + ln -s bin/{ncc,bcc} || die + + cd bootblocks || die + emake DIST="${D}" +} + +src_install() { + emake -j1 install-all DIST="${D}" + dobin bootblocks/makeboot + # remove all the stuff supplied by bin86 + rm "${D}"/usr/bin/{as,ld,nm,objdump,size}86 || die + rm "${D}"/usr/man/man1/{as,ld}86.1 || die + + dodir /usr/share + mv "${D}"/usr/{man,share/man} || die +} diff --git a/sys-devel/dev86/files/dev86-0.16.21-non-void-return-clang.patch b/sys-devel/dev86/files/dev86-0.16.21-non-void-return-clang.patch new file mode 100644 index 0000000..cb42e57 --- /dev/null +++ b/sys-devel/dev86/files/dev86-0.16.21-non-void-return-clang.patch @@ -0,0 +1,15 @@ +Return void properly, else clang aborts with +* tok_io.c:231:6: error: non-void function 'do_control' should return a value [-Wreturn-type] +See also: https://bugs.gentoo.org/show_bug.cgi?id=523096 + +--- dev86-0.16.21/unproto/tok_io.c ++++ dev86-0.16.21/unproto/tok_io.c +@@ -189,7 +189,7 @@ + + /* do_control - parse control line */ + +-static int do_control() ++static void do_control() + { + struct token *t; + int line; diff --git a/sys-devel/dev86/files/dev86-pic.patch b/sys-devel/dev86/files/dev86-pic.patch index 439c264..23158d1 100644 --- a/sys-devel/dev86/files/dev86-pic.patch +++ b/sys-devel/dev86/files/dev86-pic.patch @@ -1,5 +1,5 @@ ---- elksemu/elks.c.orig 2005-11-04 01:35:37.000000000 +0100 -+++ elksemu/elks.c 2005-11-04 01:45:28.000000000 +0100 +--- dev86-0.16.21/elksemu/elks.c.orig 2005-11-04 01:35:37.000000000 +0100 ++++ dev86-0.16.21/elksemu/elks.c 2005-11-04 01:45:28.000000000 +0100 @@ -129,8 +129,17 @@ static inline int vm86_mine(struct vm86_struct* v86) {