Module Name: src
Committed By: mrg
Date: Thu Mar 7 03:56:16 UTC 2019
Modified Files:
src/external/mit/xorg/lib: Makefile
src/external/mit/xorg/lib/fontconfig/src: Makefile
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/external/mit/xorg/lib/Makefile
cvs rdiff -u -r1.21 -r1.22 src/external/mit/xorg/lib/fontconfig/src/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/Makefile
diff -u src/external/mit/xorg/lib/Makefile:1.42 src/external/mit/xorg/lib/Makefile:1.43
--- src/external/mit/xorg/lib/Makefile:1.42 Sun Mar 11 09:43:38 2018
+++ src/external/mit/xorg/lib/Makefile Thu Mar 7 03:56:15 2019
@@ -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
Index: src/external/mit/xorg/lib/fontconfig/src/Makefile
diff -u src/external/mit/xorg/lib/fontconfig/src/Makefile:1.21 src/external/mit/xorg/lib/fontconfig/src/Makefile:1.22
--- src/external/mit/xorg/lib/fontconfig/src/Makefile:1.21 Wed May 9 08:15:09 2018
+++ src/external/mit/xorg/lib/fontconfig/src/Makefile Thu Mar 7 03:56:15 2019
@@ -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
