From 531a6cc39002b57ccb9b2f88355041062d805df2 Mon Sep 17 00:00:00 2001 From: mrg Date: Thu, 7 Mar 2019 03:56:15 +0000 Subject: [PATCH] build libutil_ul and link it into fontconfig. this should not change the output as no functions will be consumed by fontconfig yet, but will be used in an update shortly. --- external/mit/xorg/lib/Makefile | 4 ++-- external/mit/xorg/lib/fontconfig/src/Makefile | 8 +++++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/external/mit/xorg/lib/Makefile b/external/mit/xorg/lib/Makefile index b805f569715e..55c87ff0c5af 100644 --- a/external/mit/xorg/lib/Makefile +++ b/external/mit/xorg/lib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.42 2018/03/11 09:43:38 mrg Exp $ +# $NetBSD: Makefile,v 1.43 2019/03/07 03:56:15 mrg Exp $ # build libraries for xorg @@ -16,7 +16,7 @@ SUBDIR+=libdrm_radeon pixman .if !defined(MLIBDIR) SUBDIR+=xkeyboard-config .endif -SUBDIR+=libxcb \ +SUBDIR+=libxcb ../../../bsd/libuuid_ul/lib/libuuid_ul \ .WAIT .if !defined(MLIBDIR) SUBDIR+=dri7 dri gallium diff --git a/external/mit/xorg/lib/fontconfig/src/Makefile b/external/mit/xorg/lib/fontconfig/src/Makefile index 8915a25c74cc..9e38db8906ab 100644 --- a/external/mit/xorg/lib/fontconfig/src/Makefile +++ b/external/mit/xorg/lib/fontconfig/src/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2018/05/09 08:15:09 mrg Exp $ +# $NetBSD: Makefile,v 1.22 2019/03/07 03:56:15 mrg Exp $ .include @@ -132,6 +132,12 @@ PKGCONFIG_SED_FLAGS= \ s,@BASECONFIGDIR@,/etc/fonts,; \ s,@fc_cachedir@,${FONTCONFIG_PATH}," +LIBUUID_DIST= ${NETBSDSRCDIR}/external/bsd/libuuid_ul/lib/libuuid_ul +.include "${LIBUUID_DIST}/libuuid_ul-rename.mk" +LIBUUID_ULDIR!= cd ${LIBUUID_DIST} && ${PRINTOBJDIR} +LDADD+= ${LIBUUID_ULDIR}/libuuid_ul.a +DPADD+= ${LIBUUID_ULDIR}/libuuid_ul.a + # XXX CPPFLAGS.fcxml.c= -Wno-error