From 6e7c8ee5d52819b233012e7251b3c3a7dd20b5f9 Mon Sep 17 00:00:00 2001 From: David Seifert Date: Fri, 12 Feb 2016 18:19:06 +0100 Subject: 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 | 76 -------------------------------- sys-devel/dev86/dev86-0.16.21-r2.ebuild | 78 +++++++++++++++++++++++++++++++++ 2 files changed, 78 insertions(+), 76 deletions(-) delete mode 100644 sys-devel/dev86/dev86-0.16.21-r1.ebuild create mode 100644 sys-devel/dev86/dev86-0.16.21-r2.ebuild (limited to 'sys-devel/dev86') diff --git a/sys-devel/dev86/dev86-0.16.21-r1.ebuild b/sys-devel/dev86/dev86-0.16.21-r1.ebuild deleted file mode 100644 index 9942a8284b5a..000000000000 --- a/sys-devel/dev86/dev86-0.16.21-r1.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# 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/dev86-0.16.21-r2.ebuild b/sys-devel/dev86/dev86-0.16.21-r2.ebuild new file mode 100644 index 000000000000..ab48df42c6ec --- /dev/null +++ b/sys-devel/dev86/dev86-0.16.21-r2.ebuild @@ -0,0 +1,78 @@ +# 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} + + 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 +} -- cgit v1.2.3-65-gdbad