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.
This commit is contained in:
mrg 2019-03-07 03:56:15 +00:00
parent e35ff3d389
commit 531a6cc390
2 changed files with 9 additions and 3 deletions

View File

@ -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

View File

@ -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 <bsd.own.mk>
@ -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