Module Name: src
Committed By: christos
Date: Thu May 16 01:22:36 UTC 2019
Modified Files:
src/external/mit/xorg/lib: asm.mk
src/external/mit/xorg/lib/gallium: Makefile
src/external/mit/xorg/lib/libGL: Makefile
src/external/mit/xorg/lib/libpciaccess: Makefile
Log Message:
Fix MKCOMPATX11 build
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/lib/asm.mk
cvs rdiff -u -r1.26 -r1.27 src/external/mit/xorg/lib/gallium/Makefile
cvs rdiff -u -r1.26 -r1.27 src/external/mit/xorg/lib/libGL/Makefile
cvs rdiff -u -r1.8 -r1.9 src/external/mit/xorg/lib/libpciaccess/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/asm.mk
diff -u src/external/mit/xorg/lib/asm.mk:1.2 src/external/mit/xorg/lib/asm.mk:1.3
--- src/external/mit/xorg/lib/asm.mk:1.2 Fri Apr 5 06:31:53 2019
+++ src/external/mit/xorg/lib/asm.mk Wed May 15 21:22:35 2019
@@ -1,17 +1,16 @@
-# $NetBSD: asm.mk,v 1.2 2019/04/05 10:31:53 maya Exp $
+# $NetBSD: asm.mk,v 1.3 2019/05/16 01:22:35 christos Exp $
# Shared with libmesa.mk / libGL / libglapi
-.if ${MACHINE} == "amd64"
-CPPFLAGS+= \
+X11ASM_CPPFLAGS.x86_64+= \
-DUSE_SSE41 \
-DUSE_X86_64_ASM
-.elif ${MACHINE} == "i386"
-CPPFLAGS+= \
+
+X11ASM_CPPFLAGS.i386+= \
-DUSE_X86_ASM \
-DUSE_MMX_ASM \
-DUSE_3DNOW_ASM \
-DUSE_SSE_ASM \
-DGLX_X86_READONLY_TEXT
-.elif ${MACHINE} == "sparc" || ${MACHINE} == "sparc64"
-.endif
+
+CPPFLAGS+= ${X11ASM_CPPFLAGS.${XORG_MACHINE_ARCH:U${MACHINE_ARCH}}}
Index: src/external/mit/xorg/lib/gallium/Makefile
diff -u src/external/mit/xorg/lib/gallium/Makefile:1.26 src/external/mit/xorg/lib/gallium/Makefile:1.27
--- src/external/mit/xorg/lib/gallium/Makefile:1.26 Sat May 11 13:44:16 2019
+++ src/external/mit/xorg/lib/gallium/Makefile Wed May 15 21:22:35 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2019/05/11 17:44:16 christos Exp $
+# $NetBSD: Makefile,v 1.27 2019/05/16 01:22:35 christos Exp $
# Link the gallium mega driver.
@@ -1045,9 +1045,8 @@ CPPFLAGS.streaming-load-memcpy.c+= -msse
.endif
# Needs 64bit atomics
-.if ${MACHINE} == "i386"
-CPPFLAGS+= -march=i586
-.endif
+CPPFLAGS.i386+= -march=i586
+CPPFLAGS+= ${CPPFLAGS.${XORG_MACHINE_ARCH:U${MACHINE_ARCH}}}
.include "../driver.mk"
Index: src/external/mit/xorg/lib/libGL/Makefile
diff -u src/external/mit/xorg/lib/libGL/Makefile:1.26 src/external/mit/xorg/lib/libGL/Makefile:1.27
--- src/external/mit/xorg/lib/libGL/Makefile:1.26 Thu Apr 18 18:49:08 2019
+++ src/external/mit/xorg/lib/libGL/Makefile Wed May 15 21:22:36 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2019/04/18 22:49:08 mrg Exp $
+# $NetBSD: Makefile,v 1.27 2019/05/16 01:22:36 christos Exp $
.include <bsd.own.mk>
@@ -60,12 +60,13 @@ BUILDSYMLINKS+= ${X11SRCDIR.Mesa}/src/ut
SRCS.glapi= glapi_gentable.c
.PATH: ${X11SRCDIR.Mesa}/src/mapi/glapi
-.if ${MACHINE_ARCH} == "i386"
-SRCS.glx+= glapi_x86.S
-.elif ${MACHINE_ARCH} == "x86_64"
-SRCS.glx+= glapi_x86-64.S
-.elif ${MACHINE_ARCH} == "sparc"
-SRCS.glx+= glapi_sparc.S
+
+SRCS.i386.glx= glapi_x86.S
+SRCS.x86_64.glx= glapi_x86-64.S
+SRCS.sparc.glx= glapi_sparc.S
+
+.if !empty(SRCS.${MACHINE_ARCH}.glx)
+SRCS.glx += ${SRCS.${XORG_MACHINE_ARCH:U${MACHINE_ARCH}}.glx}
.else
SRCS.glapi+= entry.c
.endif
Index: src/external/mit/xorg/lib/libpciaccess/Makefile
diff -u src/external/mit/xorg/lib/libpciaccess/Makefile:1.8 src/external/mit/xorg/lib/libpciaccess/Makefile:1.9
--- src/external/mit/xorg/lib/libpciaccess/Makefile:1.8 Tue Jan 5 08:07:47 2016
+++ src/external/mit/xorg/lib/libpciaccess/Makefile Wed May 15 21:22:36 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2016/01/05 13:07:47 christos Exp $
+# $NetBSD: Makefile,v 1.9 2019/05/16 01:22:36 christos Exp $
.include <bsd.own.mk>
@@ -6,8 +6,6 @@ LIB= pciaccess
.PATH: ${X11SRCDIR.${LIB}}/src
.PATH: ${X11SRCDIR.${LIB}}/include
-XORG_MACHINE_ARCH?=${MACHINE_ARCH}
-
SRCS= common_bridge.c \
common_io.c \
common_iterator.c \
@@ -33,16 +31,9 @@ PKGDIST= ${LIB}
LIBDPLIBS+= pci ${NETBSDSRCDIR}/lib/libpci \
z ${NETBSDSRCDIR}/lib/libz
-.if ${XORG_MACHINE_ARCH} == "i386" || ${XORG_MACHINE_ARCH} == "x86_64"
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
CPPFLAGS+= -DHAVE_MTRR
-.endif
-
-.if ${XORG_MACHINE_ARCH} == "i386"
-LIBDPLIBS+= i386 ${NETBSDSRCDIR}/lib/libarch
-.endif
-
-.if ${XORG_MACHINE_ARCH} == "x86_64"
-LIBDPLIBS+= x86_64 ${NETBSDSRCDIR}/lib/libarch
+LIBDPLIBS+= ${XORG_MACHINE_ARCH:U${MACHINE_ARCH}} ${NETBSDSRCDIR}/lib/libarch
.endif
.include <bsd.x11.mk>
