From e8864e5e82fe0e4b814c137967836badd0f81942 Mon Sep 17 00:00:00 2001 From: tsutsui Date: Thu, 26 Jan 2023 17:16:57 +0000 Subject: [PATCH] Fix link errors now complained by new ld(1) from binutils 2.39. --- .../mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile | 6 +++++- external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile b/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile index f054d338fe98..a04e47fee4c9 100644 --- a/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile +++ b/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile @@ -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 @@ -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} diff --git a/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun b/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun index 3c5ca4d3b9fd..6366bf8cdb33 100644 --- a/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun +++ b/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun @@ -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 @@ -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}