[arch-commits] Commit in bochs/repos (3 files)

[Anatol Pomozov]

    Date: Friday, March 20, 2020 @ 15:45:19
  Author: anatolik
Revision: 601758

archrelease: copy trunk to community-testing-x86_64

Added:
  bochs/repos/community-testing-x86_64/
  bochs/repos/community-testing-x86_64/PKGBUILD
    (from rev 601757, bochs/trunk/PKGBUILD)
  bochs/repos/community-testing-x86_64/fix-build.patch
    (from rev 601757, bochs/trunk/fix-build.patch)

-----------------+
 PKGBUILD        |   61 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 fix-build.patch |   21 ++++++++++++++++++
 2 files changed, 82 insertions(+)

Copied: bochs/repos/community-testing-x86_64/PKGBUILD (from rev 601757, bochs/trunk/PKGBUILD)
===================================================================
--- community-testing-x86_64/PKGBUILD	                        (rev 0)
+++ community-testing-x86_64/PKGBUILD	2020-03-20 15:45:19 UTC (rev 601758)
@@ -0,0 +1,61 @@
+# Maintainer: Kyle Keen <keenerd at gmail.com>
+# Contributor: Tom Newsom <Jeepster at gmx.co.uk>
+# Contributor: Kevin Piche <kevin at archlinux.org>
+
+pkgname=bochs
+pkgver=2.6.11
+pkgrel=1
+pkgdesc="A portable x86 PC emulation software package, including GUI debugger"
+arch=('x86_64')
+url="http://bochs.sourceforge.net/"
+license=('LGPL')
+depends=('gcc-libs' 'libxrandr' 'libxpm' 'gtk2')
+source=("https://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz"
+        "fix-build.patch")
+sha256sums=('63897b41fbbbdfb1c492d3c4dee1edb4224282a07bbdf442a4a68c19bcc18862'
+            '3c6352bc9b32de00bc68b614b49879b4475ad37620b17573d69526241ef2ab3e')
+
+prepare() {
+    cd "$srcdir/$pkgname-$pkgver"
+    # 4.X kernel is basically 3.20
+    sed -i 's/2\.6\*|3\.\*)/2.6*|3.*|4.*)/' configure*
+
+    patch -p1 < ../fix-build.patch # https://sourceforge.net/p/bochs/bugs/1411/
+}
+
+build() {
+    cd "$srcdir/$pkgname-$pkgver"
+
+    ./configure \
+        --prefix=/usr \
+        --without-wx \
+        --with-x11 \
+        --with-x \
+        --with-term \
+        --disable-docbook \
+        --enable-cpu-level=6 \
+        --enable-fpu \
+        --enable-3dnow \
+        --enable-disasm \
+        --enable-smp \
+        --enable-x86-64 \
+        --enable-avx \
+	--enable-evex \
+        --enable-long-phy-address \
+        --enable-disasm \
+        --enable-pcidev \
+        --enable-usb \
+        --enable-debugger
+        #--with-sdl
+        #--enable-x86-debugger
+        #--enable-all-optimizations
+        #--enable-plugins
+    sed -i 's/^LIBS = /LIBS = -lpthread/g' Makefile
+    make -j 1
+}
+
+package() {
+    cd "$srcdir/$pkgname-$pkgver"
+    make DESTDIR="$pkgdir" install
+    install -Dm644 .bochsrc "$pkgdir/etc/bochsrc-sample.txt"
+}

Copied: bochs/repos/community-testing-x86_64/fix-build.patch (from rev 601757, bochs/trunk/fix-build.patch)
===================================================================
--- community-testing-x86_64/fix-build.patch	                        (rev 0)
+++ community-testing-x86_64/fix-build.patch	2020-03-20 15:45:19 UTC (rev 601758)
@@ -0,0 +1,21 @@
+Description: Fix the build with SMP enabled
+Origin: https://sourceforge.net/p/bochs/code/13778/
+
+Index: bochs/bx_debug/dbg_main.cc
+===================================================================
+--- bochs/bx_debug/dbg_main.cc	(revision 13777)
++++ bochs/bx_debug/dbg_main.cc	(working copy)
+@@ -1494,11 +1494,11 @@
+ {
+   char cpu_param_name[16];
+ 
+-  Bit32u index = BX_ITLB_INDEX_OF(laddr);
++  Bit32u index = BX_CPU(dbg_cpu)->ITLB.get_index_of(laddr);
+   sprintf(cpu_param_name, "ITLB.entry%d", index);
+   bx_dbg_show_param_command(cpu_param_name, 0);
+ 
+-  index = BX_DTLB_INDEX_OF(laddr, 0);
++  index = BX_CPU(dbg_cpu)->DTLB.get_index_of(laddr);
+   sprintf(cpu_param_name, "DTLB.entry%d", index);
+   bx_dbg_show_param_command(cpu_param_name, 0);
+ }