modular-xorg-server: fix build on aarch64

This commit is contained in:
tnn 2020-02-05 20:18:27 +00:00
parent 9e3ac6e311
commit e4002b040b
2 changed files with 15 additions and 6 deletions

View file

@ -1,10 +1,10 @@
$NetBSD: distinfo,v 1.99 2020/01/15 14:24:03 wiz Exp $
$NetBSD: distinfo,v 1.100 2020/02/05 20:18:27 tnn Exp $
SHA1 (xorg-server-1.20.7.tar.bz2) = 11d048431dc7582898628149ca3a758008b7d50b
RMD160 (xorg-server-1.20.7.tar.bz2) = 6dbe9b9f29ff89a84276d76a269321baa706b23f
SHA512 (xorg-server-1.20.7.tar.bz2) = c67612e379111c28c68941c0a660abf72be7669591b41ccaa3b3474c4540a03822a28d892831b12ce08bac6e5e7e33504c2d19ef2a0c2298f83bd083459f96f5
Size (xorg-server-1.20.7.tar.bz2) = 6303005 bytes
SHA1 (patch-configure) = 9e9f497f14d563ef66f25c637a14b0bea2243c3f
SHA1 (patch-configure) = ce2c732c3d8493445744a927a25b9cd3b45880f8
SHA1 (patch-hw_xfree86_common_xf86AutoConfig.c) = 70adf85be9fc6222a335686e7e9e9f385aca02f9
SHA1 (patch-hw_xfree86_common_xf86sbusBus.h) = f56f87336b2f669413ebb1005a2b64568a111f92
SHA1 (patch-hw_xfree86_dri2_dri2.c) = 0bf58305059321e10f6f58186301dbb7cb858c2a

View file

@ -1,13 +1,22 @@
$NetBSD: patch-configure,v 1.4 2017/01/28 21:47:55 maya Exp $
$NetBSD: patch-configure,v 1.5 2020/02/05 20:18:27 tnn Exp $
Use USE_AMD64_IOPL (actually x86_64_iopl) on NetBSD/amd64.
(c.f. patch-hw_xfree86_os-support_bsd_i386.c)
for netbsd, force pass pthread configure checks (pthread not needed)
--- configure.orig 2015-02-10 22:49:52.000000000 +0000
--- configure.orig 2020-01-13 22:57:18.000000000 +0000
+++ configure
@@ -23235,7 +23235,7 @@ $as_echo "#define USE_DEV_IO 1" >>confde
@@ -23146,7 +23146,7 @@ $as_echo "#define USE_ALPHA_PIO 1" >>con
esac
GLX_ARCH_DEFINES="-D__GLX_ALIGN64 -mieee"
;;
- arm*)
+ *arm*|aarch64)
ARM_VIDEO=yes
DEFAULT_INT10="stub"
;;
@@ -23188,7 +23188,7 @@ $as_echo "#define USE_DEV_IO 1" >>confde
$as_echo "#define USE_DEV_IO 1" >>confdefs.h
;;
*netbsd*)
@ -16,7 +25,7 @@ for netbsd, force pass pthread configure checks (pthread not needed)
SYS_LIBS=-lx86_64
;;
@@ -25079,7 +25079,8 @@ case ${host_os} in
@@ -25010,7 +25010,8 @@ case ${host_os} in
netbsd*)
# use libc stubs, don't link against libpthread, to allow
# dynamic loading