Module Name: src
Committed By: kre
Date: Fri Apr 5 08:51:27 UTC 2024
Modified Files:
src/external: Makefile
src/external/mit/libuv/lib: Makefile
Log Message:
Probable hack fix for current build breakage.
Make sure to build external/mit before external/mpl (as bind in mpl
needs libuv from mit) and in mit/libuv make sure to build the
static library with the new MAKESTATICLIB mechanism, as that is
what bind needs.
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/external/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/mit/libuv/lib/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/Makefile
diff -u src/external/Makefile:1.23 src/external/Makefile:1.24
--- src/external/Makefile:1.23 Sun Dec 12 20:33:21 2021
+++ src/external/Makefile Fri Apr 5 08:51:27 2024
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.23 2021/12/12 20:33:21 maya Exp $
+# $NetBSD: Makefile,v 1.24 2024/04/05 08:51:27 kre Exp $
SUBDIR+= amdgpu-firmware apache2 atheros broadcom bsd cddl gpl2 gpl3 historical
-SUBDIR+= intel-fw-eula intel-fw-public ibm-public mpl mit nvidia-firmware ofl
+SUBDIR+= intel-fw-eula intel-fw-public ibm-public mit .WAIT mpl nvidia-firmware ofl
SUBDIR+= public-domain realtek
.include <bsd.subdir.mk>
Index: src/external/mit/libuv/lib/Makefile
diff -u src/external/mit/libuv/lib/Makefile:1.6 src/external/mit/libuv/lib/Makefile:1.7
--- src/external/mit/libuv/lib/Makefile:1.6 Thu Sep 22 21:22:50 2022
+++ src/external/mit/libuv/lib/Makefile Fri Apr 5 08:51:27 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2022/09/22 21:22:50 christos Exp $
+# $NetBSD: Makefile,v 1.7 2024/04/05 08:51:27 kre Exp $
LIBISPRIVATE=pic
@@ -7,6 +7,9 @@ LIBISPRIVATE=pic
MKLINT= no
LIB= uv
+MAKESTATICLIB=yes
+MAKELINKLIB=yes
+
.if ${LIBISPRIVATE:Uno} == "no"
INCS= uv.h uv/unix.h uv/bsd.h uv/errno.h uv/version.h uv/threadpool.h
INCSDIR=/usr/include
