[gentoo-commits] repo/gentoo:master commit in: sys-devel/dev86/
commit: d5001d905b9e79d44e00e41313a26114eea6823e Author: Cristian Othón Martínez Vera cfuga mx> AuthorDate: Wed Feb 22 19:47:55 2023 + Commit: Sam James gentoo org> CommitDate: Wed Feb 22 19:55:47 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5001d90 sys-devel/dev86: fix MissingRemoteId for maintainer-needed packages Signed-off-by: Cristian Othón Martínez Vera cfuga.mx> Signed-off-by: Sam James gentoo.org> sys-devel/dev86/metadata.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys-devel/dev86/metadata.xml b/sys-devel/dev86/metadata.xml index 115e9d64a669..c4f5ea2afda9 100644 --- a/sys-devel/dev86/metadata.xml +++ b/sys-devel/dev86/metadata.xml @@ -2,4 +2,7 @@ https://www.gentoo.org/dtd/metadata.dtd;> + + lkundrak/dev86 +
[gentoo-commits] repo/gentoo:master commit in: sys-devel/dev86/, sys-devel/dev86/files/
commit: 09a2c0823d2dd32c9000256b48adbf3e93f89afa Author: Denis Pronin yandex ru> AuthorDate: Sat Mar 19 10:17:46 2022 + Commit: Joonas Niilola gentoo org> CommitDate: Sat Mar 26 07:36:20 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09a2c082 sys-devel/dev86: add clang patch to 0.16.21-r3 patched bootblocks/makeboot.c of sys-devel/dev86-0.16.21-r3 Signed-off-by: Denis Pronin yandex.ru> Closes: https://github.com/gentoo/gentoo/pull/24659 Signed-off-by: Joonas Niilola gentoo.org> sys-devel/dev86/dev86-0.16.21-r3.ebuild | 3 ++- ...6-0.16.21-void-return-check-msdos-clang-fix.patch | 20 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/sys-devel/dev86/dev86-0.16.21-r3.ebuild b/sys-devel/dev86/dev86-0.16.21-r3.ebuild index 2af636abe3e1..e3784e658bfb 100644 --- a/sys-devel/dev86/dev86-0.16.21-r3.ebuild +++ b/sys-devel/dev86/dev86-0.16.21-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -22,6 +22,7 @@ PATCHES=( "${FILESDIR}/${PN}-0.16.19-fortify.patch" "${FILESDIR}/${P}-non-void-return-clang.patch" "${FILESDIR}/${PN}-0.16.21-make.patch" + "${FILESDIR}/${P}-void-return-check-msdos-clang-fix.patch" ) src_prepare() { diff --git a/sys-devel/dev86/files/dev86-0.16.21-void-return-check-msdos-clang-fix.patch b/sys-devel/dev86/files/dev86-0.16.21-void-return-check-msdos-clang-fix.patch new file mode 100644 index ..39e3a1296c21 --- /dev/null +++ b/sys-devel/dev86/files/dev86-0.16.21-void-return-check-msdos-clang-fix.patch @@ -0,0 +1,20 @@ +--- a/bootblocks/makeboot.c2020-11-30 00:28:40.383078094 +0300 b/bootblocks/makeboot.c2020-11-30 00:28:26.969025659 +0300 +@@ -183,6 +183,8 @@ + unsigned char bpb_flags[100]; + int has_bpb_overrides = 0; + ++static void check_msdos(); ++ + main(argc, argv) + int argc; + char ** argv; +@@ -1122,7 +1124,7 @@ + + /**/ + +-check_msdos() ++static void check_msdos() + { +decode_super(buffer); +if( dosflds[DOS_CLUST].value == 0 )/* MSDOS v1.0 */
[gentoo-commits] repo/gentoo:master commit in: sys-devel/dev86/
commit: deda208db980a656c9f3b94fbd2ce6b0d57ab497 Author: Mike Gilbert gentoo org> AuthorDate: Mon Apr 5 01:25:34 2021 + Commit: Mike Gilbert gentoo org> CommitDate: Mon Apr 5 01:25:34 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=deda208d sys-devel/dev86: maintainer needed Signed-off-by: Mike Gilbert gentoo.org> sys-devel/dev86/metadata.xml | 5 + 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/sys-devel/dev86/metadata.xml b/sys-devel/dev86/metadata.xml index 4eb20a048df..7a38bb90096 100644 --- a/sys-devel/dev86/metadata.xml +++ b/sys-devel/dev86/metadata.xml @@ -1,8 +1,5 @@ http://www.gentoo.org/dtd/metadata.dtd;> - - base-sys...@gentoo.org - Gentoo Base System - +
[gentoo-commits] repo/gentoo:master commit in: sys-devel/dev86/
commit: ac6a39c9e67b09f91330e84dcb627d3a8e30d44c Author: Mike Gilbert gentoo org> AuthorDate: Sun Apr 4 18:25:32 2021 + Commit: Mike Gilbert gentoo org> CommitDate: Sun Apr 4 18:25:32 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac6a39c9 sys-devel/dev86: avoid D in src_compile Signed-off-by: Mike Gilbert gentoo.org> sys-devel/dev86/dev86-0.16.21-r3.ebuild | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys-devel/dev86/dev86-0.16.21-r3.ebuild b/sys-devel/dev86/dev86-0.16.21-r3.ebuild index 49c8438e9bb..2af636abe3e 100644 --- a/sys-devel/dev86/dev86-0.16.21-r3.ebuild +++ b/sys-devel/dev86/dev86-0.16.21-r3.ebuild @@ -49,7 +49,6 @@ src_compile() { # 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" \ @@ -63,7 +62,6 @@ src_compile() { cd bootblocks || die emake \ - DIST="${D}" \ HOSTCC="$(tc-getCC)" }
[gentoo-commits] repo/gentoo:master commit in: sys-devel/dev86/
commit: 45a1b77670dea6baea8f460a168d36ce4e1f51d6 Author: Sam James gentoo org> AuthorDate: Sun Mar 28 07:11:01 2021 + Commit: Sam James gentoo org> CommitDate: Sun Mar 28 07:11:01 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45a1b776 sys-devel/dev86: Keyword 0.16.21-r3 arm, #600508 Signed-off-by: Sam James gentoo.org> sys-devel/dev86/dev86-0.16.21-r3.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys-devel/dev86/dev86-0.16.21-r3.ebuild b/sys-devel/dev86/dev86-0.16.21-r3.ebuild index 8990be8b969..49c8438e9bb 100644 --- a/sys-devel/dev86/dev86-0.16.21-r3.ebuild +++ b/sys-devel/dev86/dev86-0.16.21-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,7 +10,7 @@ SRC_URI="http://v3.sk/~lkundrak/dev86/Dev86src-${PV}.tar.gz; LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86" +KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86" IUSE="" RDEPEND="sys-devel/bin86"
[gentoo-commits] repo/gentoo:master commit in: sys-devel/dev86/
commit: 555eb4458f1064d47e148d5aa496ff96ee967bbb Author: Robin H. Johnson gentoo org> AuthorDate: Tue Apr 21 17:17:36 2020 + Commit: Robin H. Johnson gentoo org> CommitDate: Tue Apr 21 17:18:01 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=555eb445 sys-devel/dev86: fix which CC Closes: https://bugs.gentoo.org/717698 Signed-off-by: Robin H. Johnson gentoo.org> sys-devel/dev86/dev86-0.16.21-r3.ebuild | 8 ++-- sys-devel/dev86/metadata.xml| 5 - 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/sys-devel/dev86/dev86-0.16.21-r3.ebuild b/sys-devel/dev86/dev86-0.16.21-r3.ebuild index 25c40753bda..8990be8b969 100644 --- a/sys-devel/dev86/dev86-0.16.21-r3.ebuild +++ b/sys-devel/dev86/dev86-0.16.21-r3.ebuild @@ -52,7 +52,8 @@ src_compile() { DIST="${D}" \ CC="$(tc-getCC)" \ LIBDIR="/usr/$(get_libdir)/bcc" \ - INCLDIR="/usr/$(get_libdir)/bcc" + INCLDIR="/usr/$(get_libdir)/bcc" \ + all export PATH=${S}/bin:${PATH} @@ -61,7 +62,10 @@ src_compile() { cd .. || die cd bootblocks || die - emake DIST="${D}" + emake \ + DIST="${D}" \ + HOSTCC="$(tc-getCC)" + } src_install() { diff --git a/sys-devel/dev86/metadata.xml b/sys-devel/dev86/metadata.xml index 771fca6d011..4a5b3a34f9c 100644 --- a/sys-devel/dev86/metadata.xml +++ b/sys-devel/dev86/metadata.xml @@ -1,7 +1,10 @@ http://www.gentoo.org/dtd/metadata.dtd;> - + + base-sys...@gentoo.org + Gentoo Base System + Bruce's C compiler - Simple C compiler to generate 8086 code
[gentoo-commits] repo/gentoo:master commit in: sys-devel/dev86/
commit: cbdcdf4e56070aef47a3fd8052ba74b5b42dd6b2 Author: Ben Kohler gentoo org> AuthorDate: Tue Mar 24 12:53:09 2020 + Commit: Ben Kohler gentoo org> CommitDate: Tue Mar 24 13:31:32 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cbdcdf4e sys-devel/dev86: fix bad sed delimiter Closes: https://bugs.gentoo.org/710974 Package-Manager: Portage-2.3.95, Repoman-2.3.21 Signed-off-by: Ben Kohler gentoo.org> sys-devel/dev86/dev86-0.16.21-r3.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys-devel/dev86/dev86-0.16.21-r3.ebuild b/sys-devel/dev86/dev86-0.16.21-r3.ebuild index 35355a20312..25c40753bda 100644 --- a/sys-devel/dev86/dev86-0.16.21-r3.ebuild +++ b/sys-devel/dev86/dev86-0.16.21-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -36,7 +36,7 @@ src_prepare() { makefile.in || die fi - sed -i -e "s:-O2 -g:${CFLAGS}:" -e '/INEXE=/s:-s::' makefile.in || die + 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
[gentoo-commits] repo/gentoo:master commit in: sys-devel/dev86/
commit: 5c026d8ee5636e75ee38f34651468b2898d872fb Author: Mikle Kolyada gentoo org> AuthorDate: Mon Feb 11 15:02:49 2019 + Commit: Mikle Kolyada gentoo org> CommitDate: Mon Feb 11 15:02:49 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c026d8e sys-devel/dev86: Drop old Signed-off-by: Mikle Kolyada gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11 sys-devel/dev86/dev86-0.16.21-r2.ebuild | 77 - 1 file changed, 77 deletions(-) diff --git a/sys-devel/dev86/dev86-0.16.21-r2.ebuild b/sys-devel/dev86/dev86-0.16.21-r2.ebuild deleted file mode 100644 index 0e731cc9563..000 --- a/sys-devel/dev86/dev86-0.16.21-r2.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -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" - -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} - - cd bin || die - ln -s ncc bcc || die - cd .. || 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 -}
[gentoo-commits] repo/gentoo:master commit in: sys-devel/dev86/
commit: 9807f480f629c8bd6b1a07122df505e60e57b31c Author: Mikle Kolyada gentoo org> AuthorDate: Mon Feb 11 15:00:46 2019 + Commit: Mikle Kolyada gentoo org> CommitDate: Mon Feb 11 15:00:46 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9807f480 sys-devel/dev86: x86 stable wrt bug #676790 Signed-off-by: Mikle Kolyada gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11 sys-devel/dev86/dev86-0.16.21-r3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-devel/dev86/dev86-0.16.21-r3.ebuild b/sys-devel/dev86/dev86-0.16.21-r3.ebuild index 7730e6cebd4..35355a20312 100644 --- a/sys-devel/dev86/dev86-0.16.21-r3.ebuild +++ b/sys-devel/dev86/dev86-0.16.21-r3.ebuild @@ -10,7 +10,7 @@ SRC_URI="http://v3.sk/~lkundrak/dev86/Dev86src-${PV}.tar.gz; LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 ~x86" +KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86" IUSE="" RDEPEND="sys-devel/bin86"
[gentoo-commits] repo/gentoo:master commit in: sys-devel/dev86/
commit: 90d7452422262bc29a30750ecfc389bb93aa5ec6 Author: Mikle Kolyada gentoo org> AuthorDate: Mon Feb 11 15:00:05 2019 + Commit: Mikle Kolyada gentoo org> CommitDate: Mon Feb 11 15:00:05 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90d74524 sys-devel/dev86: amd64 stable wrt bug #676790 Signed-off-by: Mikle Kolyada gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11 sys-devel/dev86/dev86-0.16.21-r3.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys-devel/dev86/dev86-0.16.21-r3.ebuild b/sys-devel/dev86/dev86-0.16.21-r3.ebuild index 1ba9e30203d..7730e6cebd4 100644 --- a/sys-devel/dev86/dev86-0.16.21-r3.ebuild +++ b/sys-devel/dev86/dev86-0.16.21-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,7 +10,7 @@ SRC_URI="http://v3.sk/~lkundrak/dev86/Dev86src-${PV}.tar.gz; LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86" +KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 ~x86" IUSE="" RDEPEND="sys-devel/bin86"
[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)
[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/
commit: b969ac149d4df3fd480b5e79368df73a8b88f3c5 Author: Jason Zaman gentoo org> AuthorDate: Wed Feb 14 13:16:33 2018 + Commit: Jason Zaman gentoo org> CommitDate: Wed Feb 14 13:28:59 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b969ac14 sys-devel/dev86: amd64 stable Gentoo-bug: 646678 Package-Manager: Portage-2.3.19, Repoman-2.3.6 sys-devel/dev86/dev86-0.16.21-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-devel/dev86/dev86-0.16.21-r2.ebuild b/sys-devel/dev86/dev86-0.16.21-r2.ebuild index 832575fed10..0e731cc9563 100644 --- a/sys-devel/dev86/dev86-0.16.21-r2.ebuild +++ b/sys-devel/dev86/dev86-0.16.21-r2.ebuild @@ -11,7 +11,7 @@ SRC_URI="http://v3.sk/~lkundrak/dev86/Dev86src-${PV}.tar.gz; LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 x86" +KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86" IUSE="" RDEPEND="sys-devel/bin86"
[gentoo-commits] repo/gentoo:master commit in: sys-devel/dev86/
commit: e6151faf1403c3223f30f65f451881c229d6fe7e Author: Thomas Deutschmann gentoo org> AuthorDate: Tue Feb 6 18:53:34 2018 + Commit: Thomas Deutschmann gentoo org> CommitDate: Tue Feb 6 18:53:34 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6151faf sys-devel/dev86: x86 stable (bug #646678) Package-Manager: Portage-2.3.24, Repoman-2.3.6 sys-devel/dev86/dev86-0.16.21-r2.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys-devel/dev86/dev86-0.16.21-r2.ebuild b/sys-devel/dev86/dev86-0.16.21-r2.ebuild index 701d48499a5..832575fed10 100644 --- a/sys-devel/dev86/dev86-0.16.21-r2.ebuild +++ b/sys-devel/dev86/dev86-0.16.21-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -11,7 +11,7 @@ SRC_URI="http://v3.sk/~lkundrak/dev86/Dev86src-${PV}.tar.gz; LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86" +KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 x86" IUSE="" RDEPEND="sys-devel/bin86"
[gentoo-commits] repo/gentoo:master commit in: sys-devel/dev86/
commit: c8e4f06eaf5356166b9de0ad987f40fc6d1d4ac8 Author: Jonas Stein gentoo org> AuthorDate: Sat Dec 23 12:04:00 2017 + Commit: Jonas Stein gentoo org> CommitDate: Sat Dec 23 12:04:00 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8e4f06e sys-devel/dev86: Drop old Package-Manager: Portage-2.3.19, Repoman-2.3.6 sys-devel/dev86/dev86-0.16.21.ebuild | 76 1 file changed, 76 deletions(-) diff --git a/sys-devel/dev86/dev86-0.16.21.ebuild b/sys-devel/dev86/dev86-0.16.21.ebuild deleted file mode 100644 index 703259130bc..000 --- a/sys-devel/dev86/dev86-0.16.21.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -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://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" - -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 - 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/ -}
[gentoo-commits] repo/gentoo:master commit in: sys-devel/dev86/
commit: f3f6b7bc88a3a0611e31f974539f56ddf99b4365 Author: Jonas Stein gentoo org> AuthorDate: Sat Dec 23 11:56:41 2017 + Commit: Jonas Stein gentoo org> CommitDate: Sat Dec 23 11:57:30 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3f6b7bc sys-devel/dev86: Update HOMEPAGE Package-Manager: Portage-2.3.19, Repoman-2.3.6 sys-devel/dev86/dev86-0.16.19.ebuild| 4 ++-- sys-devel/dev86/dev86-0.16.21-r2.ebuild | 2 +- sys-devel/dev86/dev86-0.16.21.ebuild| 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sys-devel/dev86/dev86-0.16.19.ebuild b/sys-devel/dev86/dev86-0.16.19.ebuild index 194de6a5b68..835423c7e4d 100644 --- a/sys-devel/dev86/dev86-0.16.19.ebuild +++ b/sys-devel/dev86/dev86-0.16.19.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="4" @@ -6,7 +6,7 @@ EAPI="4" inherit eutils multilib DESCRIPTION="Bruce's C compiler - Simple C compiler to generate 8086 code" -HOMEPAGE="http://www.debath.co.uk/; +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" diff --git a/sys-devel/dev86/dev86-0.16.21-r2.ebuild b/sys-devel/dev86/dev86-0.16.21-r2.ebuild index 39d5b5977db..701d48499a5 100644 --- a/sys-devel/dev86/dev86-0.16.21-r2.ebuild +++ b/sys-devel/dev86/dev86-0.16.21-r2.ebuild @@ -6,7 +6,7 @@ EAPI=6 inherit toolchain-funcs DESCRIPTION="Bruce's C compiler - Simple C compiler to generate 8086 code" -HOMEPAGE="http://v3.sk/~lkundrak/dev86/; +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" diff --git a/sys-devel/dev86/dev86-0.16.21.ebuild b/sys-devel/dev86/dev86-0.16.21.ebuild index ea917c7d329..703259130bc 100644 --- a/sys-devel/dev86/dev86-0.16.21.ebuild +++ b/sys-devel/dev86/dev86-0.16.21.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="5" @@ -6,7 +6,7 @@ EAPI="5" inherit eutils multilib DESCRIPTION="Bruce's C compiler - Simple C compiler to generate 8086 code" -HOMEPAGE="http://v3.sk/~lkundrak/dev86/; +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"
[gentoo-commits] repo/gentoo:master commit in: sys-devel/dev86/files/
commit: 59fcd0f85d4744a59c48312ffcb22026394643ea Author: Michael Mair-Keimberger (asterix) gmail com> AuthorDate: Thu Feb 9 19:47:52 2017 + Commit: David Seifert gentoo org> CommitDate: Thu Feb 9 22:35:37 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59fcd0f8 sys-devel/dev86: remove unused patches Closes: https://github.com/gentoo/gentoo/pull/3897 sys-devel/dev86/files/dev86-0.16.17-fortify.patch | 43 --- sys-devel/dev86/files/dev86-0.16.17-make382.patch | 11 -- 2 files changed, 54 deletions(-) diff --git a/sys-devel/dev86/files/dev86-0.16.17-fortify.patch b/sys-devel/dev86/files/dev86-0.16.17-fortify.patch deleted file mode 100644 index 715d0c4ca6..00 --- a/sys-devel/dev86/files/dev86-0.16.17-fortify.patch +++ /dev/null @@ -1,43 +0,0 @@ dev86-0.16.17/bcc/bcc.c -+++ dev86-0.16.17/bcc/bcc.c -@@ -19,6 +19,7 @@ - #ifdef __STDC__ - #include - #ifndef MSDOS -+#include - #include - #endif - #else -@@ -596,12 +597,17 @@ -} - } - --void --command_reset() --{ - #ifndef MAXPATHLEN -+#ifdef PATH_MAX -+#define MAXPATHLEN PATH_MAX -+#else - #define MAXPATHLEN 1024 - #endif -+#endif -+ -+void -+command_reset() -+{ -char buf[MAXPATHLEN]; -char ** prefix; -char * saved_cmd; -@@ -1308,11 +1314,7 @@ - - for(d=s=ptr; d && *s; s=d) - { --#ifdef MAXPATHLEN - char buf[MAXPATHLEN]; --#else -- char buf[1024]; --#endif - -free(temp); - d=strchr(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 deleted file mode 100644 index e7ce0651c6..00 --- a/sys-devel/dev86/files/dev86-0.16.17-make382.patch +++ /dev/null @@ -1,11 +0,0 @@ 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)
[gentoo-commits] repo/gentoo:master commit in: sys-devel/dev86/
commit: 6e7c8ee5d52819b233012e7251b3c3a7dd20b5f9 Author: David Seifert gentoo org> AuthorDate: Fri Feb 12 17:19:06 2016 + Commit: David Seifert gentoo org> CommitDate: Fri Feb 12 17:19:06 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e7c8ee5 sys-devel/dev86: Revbump to fix broken symlink Gentoo-Bug: 574014 Package-Manager: portage-2.2.27 sys-devel/dev86/{dev86-0.16.21-r1.ebuild => dev86-0.16.21-r2.ebuild} | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys-devel/dev86/dev86-0.16.21-r1.ebuild b/sys-devel/dev86/dev86-0.16.21-r2.ebuild similarity index 97% rename from sys-devel/dev86/dev86-0.16.21-r1.ebuild rename to sys-devel/dev86/dev86-0.16.21-r2.ebuild index 9942a82..ab48df4 100644 --- a/sys-devel/dev86/dev86-0.16.21-r1.ebuild +++ b/sys-devel/dev86/dev86-0.16.21-r2.ebuild @@ -58,7 +58,9 @@ src_compile() { export PATH=${S}/bin:${PATH} - ln -s bin/{ncc,bcc} || die + cd bin || die + ln -s ncc bcc || die + cd .. || die cd bootblocks || die emake DIST="${D}"
[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) {