[gentoo-commits] repo/gentoo:master commit in: sys-devel/dev86/files/, sys-devel/dev86/
commit: 2ec14c2b5670832a8de8affeab091e42c380d3cd
Author: Pacho Ramos gentoo org>
AuthorDate: Wed Jun 20 18:29:08 2018 +
Commit: Pacho Ramos gentoo org>
CommitDate: Wed Jun 20 18:31:56 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ec14c2b
sys-devel/dev86: Fix make call (#649940), strip properly (#651462)
Package-Manager: Portage-2.3.40, Repoman-2.3.9
sys-devel/dev86/dev86-0.16.21-r3.ebuild| 78
sys-devel/dev86/files/dev86-0.16.21-make.patch | 82 ++
2 files changed, 160 insertions(+)
diff --git a/sys-devel/dev86/dev86-0.16.21-r3.ebuild
b/sys-devel/dev86/dev86-0.16.21-r3.ebuild
new file mode 100644
index 000..1ba9e30203d
--- /dev/null
+++ b/sys-devel/dev86/dev86-0.16.21-r3.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs
+
+DESCRIPTION="Bruce's C compiler - Simple C compiler to generate 8086 code"
+HOMEPAGE="http://www.debath.co.uk/ https://github.com/lkundrak/dev86";
+SRC_URI="http://v3.sk/~lkundrak/dev86/Dev86src-${PV}.tar.gz";
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="sys-devel/bin86"
+DEPEND="${RDEPEND}
+ dev-util/gperf"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-pic.patch"
+ "${FILESDIR}/${PN}-0.16.19-fortify.patch"
+ "${FILESDIR}/${P}-non-void-return-clang.patch"
+ "${FILESDIR}/${PN}-0.16.21-make.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}
+
+ cd bin || die
+ ln -s ncc bcc || die
+ cd .. || die
+
+ cd bootblocks || die
+ emake DIST="${D}"
+}
+
+src_install() {
+ emake -j1 install-all DIST="${D}"
+ dostrip -x "/usr/*/bcc/lib*.a /usr/*/i386/libc.a"
+
+ 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-make.patch
b/sys-devel/dev86/files/dev86-0.16.21-make.patch
new file mode 100644
index 000..248ff5814db
--- /dev/null
+++ b/sys-devel/dev86/files/dev86-0.16.21-make.patch
@@ -0,0 +1,82 @@
+From f14f78efcd5c865b470173dc06959c8de61e9711 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?=
+Date: Thu, 8 Mar 2018 19:31:17 +0100
+Subject: [PATCH] build: Always use $(MAKE) to spawn sub-make
+
+Always use $(MAKE) instead of literal 'make' to spawn the correct make
+variant. Otherwise, e.g. when using 'gmake' on FreeBSD the Makefiles
+spawn BSD make and things fail because of incompatible MAKEFLAGS
+set by GNU make.
+---
+ bootblocks/Makefile | 10 +-
+ libbsd/Makefile | 2 +-
+ makefile.in | 2 +-
+ 3 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/bootblocks/Makefile b/bootblocks/Makefile
+index d954ea1..2887d86 100644
+--- a/bootblocks/Makefile
b/bootblocks/Makefile
+@@ -55,31 +55,31 @@ fs_min.o: minix.h
+
+ bootfile.sys: $(MSRC) $(MINC)
+ @rm -f $(MOBJ)
+- make 'CFLAGS=$(CFLAGS) -DDOSFLOPPY' monitor.out
++ $(MAKE) 'CFLAGS=$(CFLAGS) -DDOSFLOPPY' monitor.out
+ mv monitor.out bootfile.sys
+ @rm -f $(MOBJ)
+
+ boottar.sys: $(MSRC) $(MINC) tarboot.bin
+ @rm -f $(MOBJ)
+- make 'CFLAGS=$(CFLAGS) -DTARFLOPPY' monitor.out
++ $(MAKE) 'CFLAGS=$(CFLAGS) -DTARFLOPPY' monitor.out
+ mv monitor.out boottar.sys
+ @rm -f $(MOBJ)
+
+ bootminix.sys: $(MSRC) $(MINC) minix.bin
+ @rm -f $(MOBJ)
+- make 'CFLAGS=$(CFLAGS) -DMINFLOPPY' monitor.out
++ $(MAKE) 'CFLAGS=$(CFLAGS) -DMINFLOPPY' monitor.out
+ mv monitor.out bootminix.sys
+ @rm -f $(MOBJ)
+
+ monitor.sys: $(MSRC) $(MINC)
+ @rm -f $(MOBJ)
+- make monitor.out
++ $(MAKE) monito
[gentoo-commits] repo/gentoo:master commit in: sys-devel/dev86/files/, sys-devel/dev86/
commit: 25f5e1c6e21e184fc6323d3d098693a4edd6b63a
Author: Michael Palimaka gentoo org>
AuthorDate: Wed Feb 14 13:35:04 2018 +
Commit: Michael Palimaka gentoo org>
CommitDate: Wed Feb 14 13:35:19 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25f5e1c6
sys-devel/dev86: remove 0.16.19
Package-Manager: Portage-2.3.19, Repoman-2.3.6
sys-devel/dev86/Manifest | 1 -
sys-devel/dev86/dev86-0.16.19.ebuild | 77 ---
sys-devel/dev86/files/dev86-0.16.19-memmove.patch | 17 -
3 files changed, 95 deletions(-)
diff --git a/sys-devel/dev86/Manifest b/sys-devel/dev86/Manifest
index 1c024ea7023..4b159bf8244 100644
--- a/sys-devel/dev86/Manifest
+++ b/sys-devel/dev86/Manifest
@@ -1,2 +1 @@
-DIST Dev86src-0.16.19.tar.gz 713688 BLAKE2B
c62a552be801ff109ee30c403d43586e2601342bd6fe0902d287849a88778338764216663c5302e7401e2b09962e116f2e3569c144846e5fcec87523d69ff206
SHA512
4077f7ac800330eb4658ffaa53dc8cc982792b1dcd7a59625cba4a5dac494117c6bd4ec5307bf02349ad6ae3d0c0903ab2e41123a8df94373e469092fa005cd3
DIST Dev86src-0.16.21.tar.gz 717215 BLAKE2B
977353422937f57d2046f151a53008dcec90f4060d60675dcb81fa58af5f1ed758a1950dcbd211cda57c84b55bf58ffbad28195ff115db50a7a1108d434b8b4e
SHA512
6d35dc3c7f9735cf7967cdb2bc0f7bee967ae26667cd8cef56bbdf7d7855ef1d35057db4c0031ff86b9b95d3c8ee44aff408446115b35b6c10cf207a33838016
diff --git a/sys-devel/dev86/dev86-0.16.19.ebuild
b/sys-devel/dev86/dev86-0.16.19.ebuild
deleted file mode 100644
index 835423c7e4d..000
--- a/sys-devel/dev86/dev86-0.16.19.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils multilib
-
-DESCRIPTION="Bruce's C compiler - Simple C compiler to generate 8086 code"
-HOMEPAGE="http://www.debath.co.uk/ https://github.com/lkundrak/dev86";
-SRC_URI="http://www.debath.co.uk/dev86/Dev86src-${PV}.tar.gz";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="sys-devel/bin86"
-DEPEND="${RDEPEND}
- dev-util/gperf"
-
-STRIP_MASK="/usr/*/bcc/lib*.a /usr/*/i386/libc.a"
-
-src_prepare() {
- # 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
-
- epatch "${FILESDIR}"/dev86-pic.patch
- epatch "${FILESDIR}"/${PN}-0.16.19-fortify.patch
- epatch "${FILESDIR}"/${PN}-0.16.19-memmove.patch #354351
- 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).
- 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}
- cd bin
- ln -s ncc bcc
- cd ..
- cd bootblocks
- ln -s ../bcc/version.h .
- emake DIST="${D}"
-}
-
-src_install() {
- emake -j1 install-all DIST="${D}"
- dobin bootblocks/makeboot
- # remove all the stuff supplied by bin86
- cd "${D}"
- rm usr/bin/{as,ld,nm,objdump,size}86 || die
- rm usr/man/man1/{as,ld}86.1 || die
- dodir /usr/share/man
- mv usr/man usr/share/
-}
diff --git a/sys-devel/dev86/files/dev86-0.16.19-memmove.patch
b/sys-devel/dev86/files/dev86-0.16.19-memmove.patch
deleted file mode 100644
index 12df3f67262..000
--- a/sys-devel/dev86/files/dev86-0.16.19-memmove.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-https://bugs.gentoo.org/354351
-
-fix sniped from Debian:
-* Fix "FTBFS: ncc: illegal label": apply patch by dai that replaces strcpy
- by memmove (closes: #591133).
-
copt/copt.c
-+++ copt/copt.c
-@@ -174,7 +174,7 @@
- /* Delete leading white spaces */
- for (cp = buf; *cp && isspace(*cp); cp++) ;
- if (cp != buf && *cp)
-- strcpy(buf, cp);
-+ memmove(buf, cp, strlen(cp) + 1);
-
- return(buf);
- }
[gentoo-commits] repo/gentoo:master commit in: sys-devel/dev86/files/, sys-devel/dev86/
commit: 0a4ee8dccd9422cdc4a507c5bdd360be4802f8fd
Author: David Seifert gentoo org>
AuthorDate: Sat Feb 6 10:27:11 2016 +
Commit: David Seifert gentoo org>
CommitDate: Sat Feb 6 10:27:25 2016 +
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 000..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 000..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.orig2005-11-04 01:35:37.0 +0100
-+++ elksemu/elks.c 2005-11-04 01:45:28.0 +0100
+--- dev86-0.16.21/elksemu/elks.c.orig 2005-11-04 01:35:37.0 +0100
dev86-0.16.21/elksemu/elks.c 2005-11-04 01:45:28.0 +0100
@@ -129,8 +129,17 @@
static inline int vm86_mine(struct vm86_struct* v86)
{
