diff --git a/recipes-emulators/dosbox/dosbox-x.bb b/recipes-emulators/dosbox/dosbox-x.bb index f0923dc..9eae63c 100644 --- a/recipes-emulators/dosbox/dosbox-x.bb +++ b/recipes-emulators/dosbox/dosbox-x.bb @@ -23,6 +23,7 @@ SRC_URI = " \ file://0001-use-pkgconfig-to-find-sdl2.patch \ file://0002-Enable-unaligned-memory-based-on-recipe-s-suggestion.patch \ file://0003-menu-Fix-segfaults-during-menu-creation-in-some-envi.patch \ + file://0004-Treat-all-arm-hosts-as-armv7.patch \ file://dosbox-x.desktop \ " SRCREV = "0f1435e18d06ac955f26211541a9556bac759ae2" @@ -37,10 +38,10 @@ EXTRA_OECONF = " \ --disable-alsatest \ " -# configure's cpu detection does not match here so set what was intended -EXTRA_OECONF_append_armv4 = " --disable-unaligned-memory" -EXTRA_OECONF_append_armv5 = " --disable-unaligned-memory" -EXTRA_OECONF_append_armv6 = " --disable-unaligned-memory" +# sorry - but it does not make sense +COMPATIBLE_HOST_armv4 = 'null' +COMPATIBLE_HOST_armv5 = 'null' +COMPATIBLE_HOST_armv6 = 'null' do_install_append() { install -d ${D}/${datadir}/applications diff --git a/recipes-emulators/dosbox/dosbox-x/0004-Treat-all-arm-hosts-as-armv7.patch b/recipes-emulators/dosbox/dosbox-x/0004-Treat-all-arm-hosts-as-armv7.patch new file mode 100644 index 0000000..53f47d3 --- /dev/null +++ b/recipes-emulators/dosbox/dosbox-x/0004-Treat-all-arm-hosts-as-armv7.patch @@ -0,0 +1,31 @@ +From 60cc0473ef7f17a5f3f43be238f37a7db786a7c3 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Sat, 24 Oct 2020 00:34:59 +0200 +Subject: [PATCH] Treat all arm hosts as armv7 le +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Inappropriate [dirty hack] + +Signed-off-by: Andreas Müller +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 8841e6c4d..6277f96c2 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -489,7 +489,7 @@ case "$host_cpu" in + c_targetcpu="m68k" + c_unalignedmemory=yes + ;; +- armv7l) ++ arm) + AC_DEFINE(C_TARGETCPU,ARMV7LE) + AC_MSG_RESULT(ARMv7 Little Endian) + c_targetcpu="arm" +-- +2.26.2 +