Fix PIC compile, CFLAGS (#111257)

Package-Manager: portage-2.0.51.22-r3

diff --git a/sys-devel/dev86/ChangeLog b/sys-devel/dev86/ChangeLog
index 06c4081cf03470bf28e46864e23156ee1804d627..782d8a57c9860209f2545a08b1f7c7abca1700b7 100644 (file)
--- a/sys-devel/dev86/ChangeLog
+++ b/sys-devel/dev86/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-devel/dev86
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/dev86/ChangeLog,v 1.2 2005/11/10 00:55:15 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/dev86/ChangeLog,v 1.3 2005/11/11 00:14:37 chrb Exp $
+
+*dev86-0.16.17-r2 (11 Nov 2005)
+
+  11 Nov 2005; <chrb@gentoo.org> +files/dev86-pic.patch,
+  +dev86-0.16.17-r2.ebuild:
+  Fix PIC compile, CFLAGS (#111257)
 
 *dev86-0.16.17-r1 (10 Nov 2005)
 

diff --git a/sys-devel/dev86/Manifest b/sys-devel/dev86/Manifest
index 375b5d10677e70421e3ae5ec7d33c89eaae30a1b..323bb317a98aa6ce8b5a8b7f94e000d242029ea4 100644 (file)
--- a/sys-devel/dev86/Manifest
+++ b/sys-devel/dev86/Manifest
@@ -1,6 +1,9 @@
-MD5 a4ece2ca84ef96d5bd6ed6542fc70c09 ChangeLog 538
+MD5 0ef0cfe0db29b56f6af5ce5de710fe5a ChangeLog 690
 MD5 966e0769a2356eeca1a6fb4add9bafa1 dev86-0.16.17-r1.ebuild 1063
+MD5 860a3508215014dbf073c0099bffa9f3 dev86-0.16.17-r2.ebuild 1152
 MD5 54f319d0135ff3bc61d637b76285bb04 dev86-0.16.17.ebuild 822
+MD5 87678bbfc18f05318fd76826a8e579d8 metadata.xml 349
+MD5 1b750c5561a4bde5f83f65e5827feb73 files/dev86-pic.patch 546
 MD5 e6dfe026aef9d20d51b843727b089db6 files/digest-dev86-0.16.17 68
 MD5 e6dfe026aef9d20d51b843727b089db6 files/digest-dev86-0.16.17-r1 68
-MD5 87678bbfc18f05318fd76826a8e579d8 metadata.xml 349
+MD5 e6dfe026aef9d20d51b843727b089db6 files/digest-dev86-0.16.17-r2 68

diff --git a/sys-devel/dev86/dev86-0.16.17-r2.ebuild b/sys-devel/dev86/dev86-0.16.17-r2.ebuild
new file mode 100644 (file)
index 0000000..efe52a2
--- /dev/null
+++ b/sys-devel/dev86/dev86-0.16.17-r2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2005 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-r2.ebuild,v 1.1 2005/11/11 00:14:37 chrb Exp $
+
+inherit eutils
+
+DESCRIPTION="Bruce's C compiler - Simple C compiler to generate 8086 code"
+HOMEPAGE="http://www.cix.co.uk/~mayday"
+SRC_URI="http://www.cix.co.uk/~mayday/dev86/Dev86src-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+
+DEPEND="virtual/libc
+               dev-util/gperf"
+
+src_unpack() {
+       unpack "${A}"
+       # elksemu doesn't compile under amd64
+       if use amd64; then
+               einfo "Not compiling elksemu on amd64"
+               sed -i.orig \
+                       -e 's,alt-libs elksemu,alt-libs,' \
+                       -e 's,install-lib install-emu,install-lib,' \
+                       ${S}/makefile.in
+       fi
+       cd ${S}
+       epatch "${FILESDIR}/dev86-pic.patch"
+       sed -i -e "s/-O2 -g/${CFLAGS}/" makefile.in
+}
+
+src_compile() {
+       emake -j1 DIST="${D}" || die
+
+       export PATH=${S}/bin:${PATH}
+       cd bin
+       ln -s ncc bcc
+       cd ..
+       cd bootblocks
+       ln -s ../bcc/version.h .
+       emake DIST="${D}" || die
+}
+
+src_install() {
+       make install-all DIST="${D}" || die
+       install -m 755 bootblocks/makeboot "${D}/usr/bin"
+}

diff --git a/sys-devel/dev86/files/dev86-pic.patch b/sys-devel/dev86/files/dev86-pic.patch
new file mode 100644 (file)
index 0000000..439c264
--- /dev/null
+++ b/sys-devel/dev86/files/dev86-pic.patch
@@ -0,0 +1,20 @@
+--- elksemu/elks.c.orig        2005-11-04 01:35:37.000000000 +0100
++++ elksemu/elks.c     2005-11-04 01:45:28.000000000 +0100
+@@ -129,8 +129,17 @@
+ static inline int vm86_mine(struct vm86_struct* v86)
+ {
+       int __res;
++#ifndef __PIC__
+       __asm__ __volatile__("int $0x80\n"
+       :"=a" (__res):"a" ((int)OLD_SYS_vm86), "b" ((int)v86));
++#else
++      __asm__ __volatile__(
++              "movl   %%ebx,%%ecx\n\t"
++              "movl   %2,%%ebx\n\t"
++              "int    $0x80\n\t"
++              "movl   %%ecx,%%ebx\n\t"
++              :"=a" (__res):"a" ((int)OLD_SYS_vm86), "r" ((int)v86) : "ecx");
++#endif
+       return __res;
+ } 
+ #endif

diff --git a/sys-devel/dev86/files/digest-dev86-0.16.17-r2 b/sys-devel/dev86/files/digest-dev86-0.16.17-r2
new file mode 100644 (file)
index 0000000..2b1e793
--- /dev/null
+++ b/sys-devel/dev86/files/digest-dev86-0.16.17-r2
@@ -0,0 +1 @@
+MD5 e7bbfdbe61c2fb964994a087e29b0087 Dev86src-0.16.17.tar.gz 703028