dosbox-x: Patch pregenerated ./configure. Don't use long double on non-x86.

5 files changed, 44 insertions, 27 deletions

diff --git a/emulators/dosbox-x/Makefile b/emulators/dosbox-x/Makefile
index 8fbc8c275a8..56451bf366c 100644
--- a/emulators/dosbox-x/Makefile
+++ b/emulators/dosbox-x/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.23 2020/11/19 16:52:31 nia Exp $
+# $NetBSD: Makefile,v 1.24 2020/11/19 17:17:15 nia Exp $
 
 DISTNAME=	dosbox-x-0.83.7
+PKGREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_GITHUB:=joncampbell123/}
 GITHUB_TAG=	dosbox-x-v${PKGVERSION_NOREV}
diff --git a/emulators/dosbox-x/distinfo b/emulators/dosbox-x/distinfo
index d632e56f217..63b79ef4b82 100644
--- a/emulators/dosbox-x/distinfo
+++ b/emulators/dosbox-x/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.13 2020/11/19 16:52:31 nia Exp $
+$NetBSD: distinfo,v 1.14 2020/11/19 17:17:15 nia Exp $
 
 SHA1 (dosbox-x-0.83.7.tar.gz) = 9ddfa4b40d816593dde04ca3485e80cfe8554bb6
 RMD160 (dosbox-x-0.83.7.tar.gz) = cd4edafe72c77e00166151c1fcc7d2e772d99db7
 SHA512 (dosbox-x-0.83.7.tar.gz) = 2e57bfba9e2373752142be1c61d5f59c88ca04dcf05be6c4052bc850aa413d8c359062eb5a87709b4cdc4142d21f1c0725c987d07ea7d2b67b9a3024d5c9fccb
 Size (dosbox-x-0.83.7.tar.gz) = 47403831 bytes
-SHA1 (patch-configure) = 6a4be02b1b7581dbb9656673a32a92c01cd89c83
+SHA1 (patch-configure.ac) = 915ebe5a4e1f85458e93beeeeb343fcb7ddb89bd
+SHA1 (patch-include_dosbox.h) = 69f5fc59e419b46df65991de7469480807ac009d
 SHA1 (patch-src_dos_dos__programs.cpp) = 99e49762c6812b518917daf21d27d1fb8d2b1681
diff --git a/emulators/dosbox-x/patches/patch-configure b/emulators/dosbox-x/patches/patch-configure
deleted file mode 100644
index 4c721584233..00000000000
--- a/emulators/dosbox-x/patches/patch-configure
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-configure,v 1.1 2020/11/19 16:52:31 nia Exp $
-
-Detect NetBSD/evbarm properly.
-
---- configure.orig	2020-11-19 11:29:25.115543480 +0000
-+++ configure
-@@ -7678,7 +7678,7 @@ $as_echo "Motorola 68000" >&6; }
-     c_targetcpu="m68k"
-     c_unalignedmemory=yes
-     ;;
--   armv7l)
-+   armv7*)
-     $as_echo "#define C_TARGETCPU ARMV7LE" >>confdefs.h
- 
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: ARMv7 Little Endian" >&5
-@@ -7686,7 +7686,7 @@ $as_echo "ARMv7 Little Endian" >&6; }
-     c_targetcpu="arm"
-     c_unalignedmemory=yes
-     ;;
--   armv6l)
-+   armv6*)
-     $as_echo "#define C_TARGETCPU ARMV4LE" >>confdefs.h
- 
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: ARMv6 Little Endian" >&5
diff --git a/emulators/dosbox-x/patches/patch-configure.ac b/emulators/dosbox-x/patches/patch-configure.ac
new file mode 100644
index 00000000000..d584aa21587
--- /dev/null
+++ b/emulators/dosbox-x/patches/patch-configure.ac
@@ -0,0 +1,22 @@
+$NetBSD: patch-configure.ac,v 1.4 2020/11/19 17:17:15 nia Exp $
+
+Detect NetBSD/evbarm properly.
+
+--- configure.ac.orig	2020-11-01 15:36:10.000000000 +0000
++++ configure.ac
+@@ -499,13 +499,13 @@ case "$host_cpu" in
+     c_targetcpu="m68k"
+     c_unalignedmemory=yes
+     ;;
+-   armv7l)
++   armv7*)
+     AC_DEFINE(C_TARGETCPU,ARMV7LE)
+     AC_MSG_RESULT(ARMv7 Little Endian)
+     c_targetcpu="arm"
+     c_unalignedmemory=yes
+     ;;
+-   armv6l)
++   armv6*)
+     AC_DEFINE(C_TARGETCPU,ARMV4LE)
+     AC_MSG_RESULT(ARMv6 Little Endian)
+     c_targetcpu="arm"
diff --git a/emulators/dosbox-x/patches/patch-include_dosbox.h b/emulators/dosbox-x/patches/patch-include_dosbox.h
new file mode 100644
index 00000000000..bf200e3ef61
--- /dev/null
+++ b/emulators/dosbox-x/patches/patch-include_dosbox.h
@@ -0,0 +1,17 @@
+$NetBSD: patch-include_dosbox.h,v 1.1 2020/11/19 17:17:15 nia Exp $
+
+Only attempt to use long double on x86.
+
+--- include/dosbox.h.orig	2020-11-01 15:36:10.000000000 +0000
++++ include/dosbox.h
+@@ -72,9 +72,7 @@
+ // TODO: The autoconf script should test the size of long double
+ #if defined(_MSC_VER)
+ // Microsoft C++ sizeof(long double) == sizeof(double)
+-#elif defined(__arm__)
+-// ARMv7 (Raspberry Pi) does not have long double, sizeof(long double) == sizeof(double)
+-#else
++#elif C_TARGETCPU == X86_64 || C_TARGETCPU == X86
+ // GCC, other compilers, have sizeof(long double) == 10 80-bit IEEE
+ # define HAS_LONG_DOUBLE		1
+ #endif