summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Sherman2020-07-16 14:47:00 -0400
committerBenjamin Sherman2020-07-16 14:47:00 -0400
commit8639b8c3e595b73d64c1e445e6fea511ef48041a (patch)
tree25ce0d32538695c3f60d8a1501cc011a90e4d657
parent378fca1b01084f8dafb5f300272549fb534057e6 (diff)
downloadaur-8639b8c3e595b73d64c1e445e6fea511ef48041a.tar.gz
Bump to 2.6.11
-rw-r--r--PKGBUILD12
-rw-r--r--fix-build.patch22
2 files changed, 31 insertions, 3 deletions
diff --git a/PKGBUILD b/PKGBUILD
index 00892e7b09a..60d7bd1bf67 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
# Modified from PKGBUILD in official repositories
pkgname=bochs-sdl
-pkgver=2.6.9
+pkgver=2.6.11
pkgrel=4
pkgdesc="A portable x86 PC emulation software package, including GUI debugger, with sdl support"
arch=('x86_64')
@@ -11,13 +11,17 @@ license=('LGPL')
depends=('gcc-libs' 'libxrandr' 'libxpm' 'gtk2')
conflicts=('bochs')
provides=('bochs')
-source=("https://downloads.sourceforge.net/sourceforge/bochs/bochs-$pkgver.tar.gz")
-md5sums=('f6670c56ac49af36174e254e82528d5f')
+source=("https://downloads.sourceforge.net/sourceforge/bochs/bochs-$pkgver.tar.gz"
+ "fix-build.patch")
+md5sums=('61dbf6d5c0384712e1f3e51e88381b4c'
+ '0ae4954b32d49ac3c7a2431ea7935d1c')
prepare() {
cd "$srcdir/bochs-$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() {
@@ -37,8 +41,10 @@ build() {
--enable-smp \
--enable-x86-64 \
--enable-avx \
+ --enable-evex \
--enable-long-phy-address \
--enable-disasm \
+ --enable-pcidev \
--enable-usb \
--enable-debugger \
--with-sdl
diff --git a/fix-build.patch b/fix-build.patch
new file mode 100644
index 00000000000..6291546f91d
--- /dev/null
+++ b/fix-build.patch
@@ -0,0 +1,22 @@
+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);
+ }
+