Module Name: src
Committed By: tsutsui
Date: Thu Jan 26 17:16:57 UTC 2023
Modified Files:
src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k: Makefile
src/external/mit/xorg/server/xorg-server/hw/sun: Makefile.Xsun
Log Message:
Fix link errors now complained by new ld(1) from binutils 2.39.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 \
src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile
cvs rdiff -u -r1.8 -r1.9 \
src/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun
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/server/xorg-server/hw/netbsd/x68k/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile:1.15 src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile:1.16
--- src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile:1.15 Thu Jan 26 17:09:46 2023
+++ src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile Thu Jan 26 17:16:57 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2023/01/26 17:09:46 tsutsui Exp $
+# $NetBSD: Makefile,v 1.16 2023/01/26 17:16:57 tsutsui Exp $
.include <bsd.own.mk>
@@ -56,6 +56,8 @@ LDADD+= ${LDADD.dix} \
${LDADD.Xi} \
-lXfont2 \
-lpixman-1 \
+ -lXdmcp \
+ -lXau \
-lX11 \
-lz \
-lm
@@ -77,6 +79,8 @@ DPADD+= ${LDADD.dix} \
${DPADD.Xi} \
${LIBXFONT2} \
${LIBPIXMAN-1} \
+ ${LIBXDMCP} \
+ ${LIBXAU} \
${LIBX11} \
${LIBZ} \
${LIBM}
Index: src/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun
diff -u src/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun:1.8 src/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun:1.9
--- src/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun:1.8 Fri Oct 28 09:43:59 2022
+++ src/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun Thu Jan 26 17:16:57 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.Xsun,v 1.8 2022/10/28 09:43:59 wiz Exp $
+# $NetBSD: Makefile.Xsun,v 1.9 2023/01/26 17:16:57 tsutsui Exp $
.include <bsd.own.mk>
@@ -99,6 +99,8 @@ LDADD+= ${LDADD.dix} \
${LDADD.Xi} \
-lXfont2 \
-lpixman-1 \
+ -lXdmcp \
+ -lXau \
-lX11 \
-lz \
-lm
@@ -120,6 +122,8 @@ DPADD+= ${LDADD.dix} \
${DPADD.Xi} \
${LIBXFONT2} \
${LIBPIXMAN-1} \
+ ${LIBXDMCP} \
+ ${LIBXAU} \
${LIBX11} \
${LIBZ} \
${LIBM}
