diff --git a/x11-packages/bochs/bochs.h.patch b/x11-packages/bochs/bochs.h.patch new file mode 100644 index 000000000..2ff0fecf1 --- /dev/null +++ b/x11-packages/bochs/bochs.h.patch @@ -0,0 +1,20 @@ +--- a/bochs.h ++++ b/bochs.h +@@ -530,7 +530,7 @@ + *((Bit16u*)(hostPtr)) = (nativeVar16) + #define WriteHostDWordToLittleEndian(hostPtr, nativeVar32) \ + *((Bit32u*)(hostPtr)) = (nativeVar32) +-#ifdef ANDROID ++#if defined ANDROID || (defined __ANDROID__ && defined __arm__) + // Resolve problems with unaligned access + #define WriteHostQWordToLittleEndian(hostPtr, nativeVar64) { \ + ((Bit8u *)(hostPtr))[0] = (Bit8u) (nativeVar64); \ +@@ -550,7 +550,7 @@ + (nativeVar16) = *((Bit16u*)(hostPtr)) + #define ReadHostDWordFromLittleEndian(hostPtr, nativeVar32) \ + (nativeVar32) = *((Bit32u*)(hostPtr)) +-#ifdef ANDROID ++#if defined ANDROID || (defined __ANDROID__ && defined __arm__) + // Resolve problems with unaligned access + #define ReadHostQWordFromLittleEndian(hostPtr, nativeVar64) { \ + (nativeVar64) = ((Bit64u) ((Bit8u *)(hostPtr))[0]) | \ diff --git a/x11-packages/bochs/build.sh b/x11-packages/bochs/build.sh index b6b469119..8520bab69 100644 --- a/x11-packages/bochs/build.sh +++ b/x11-packages/bochs/build.sh @@ -26,8 +26,3 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --enable-clgd54xx --enable-voodoo " - -termux_step_pre_configure() { - CFLAGS+=" -DANDROID" - CXXFLAGS+=" -DANDROID" -} diff --git a/x11-packages/bochs/iodev-network-slirp-misc.cc.patch b/x11-packages/bochs/iodev-network-slirp-misc.cc.patch new file mode 100644 index 000000000..aacbde679 --- /dev/null +++ b/x11-packages/bochs/iodev-network-slirp-misc.cc.patch @@ -0,0 +1,12 @@ +diff -uNr bochs-2.6.9/iodev/network/slirp/misc.cc bochs-2.6.9.mod/iodev/network/slirp/misc.cc +--- bochs-2.6.9/iodev/network/slirp/misc.cc 2016-12-14 04:22:28.000000000 +0800 ++++ bochs-2.6.9.mod/iodev/network/slirp/misc.cc 2019-08-26 20:05:37.060533000 +0800 +@@ -16,7 +16,7 @@ + #include "libslirp.h" + + #if BX_NETWORKING && BX_NETMOD_SLIRP +- ++#define ANDROID + #ifdef DEBUG + int slirp_debug = DBG_CALL|DBG_MISC|DBG_ERROR; + #endif