freebsd: 14.2->15.0 (#467971)

  generateSplicesForMkScope,

  callPackage,

  attributePathToSplice ? [ "freebsd" ],

  branch ? "release/14.2.0",

  branch ? "release/15.0.0",

}:

let

--- a/share/mk/src.libnames.mk	2023-12-21 23:56:50.767042385 -0800

+++ b/share/mk/src.libnames.mk	2023-12-21 23:56:39.671089506 -0800

@@ -392,7 +392,7 @@

 _DP_ztest=	geom m nvpair umem zpool pthread avl zfs_core spl zutil zfs uutil icp

 # The libc dependencies are not strictly needed but are defined to make the

 # assert happy.

-_DP_c=		compiler_rt sys

+_DP_c=		sys

 # Use libssp_nonshared only on i386 and power*.  Other archs emit direct calls

 # to __stack_chk_fail, not __stack_chk_fail_local provided by libssp_nonshared.

 .if ${MK_SSP} != "no" && \

diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk

index 5f328d5378ca..89d16dc6fa41 100644

--- a/share/mk/bsd.lib.mk

+++ b/share/mk/bsd.lib.mk

@@ -242,7 +242,7 @@ PO_FLAG=-pg

 _LIBDIR:=${LIBDIR}

 _SHLIBDIR:=${SHLIBDIR}

-.if defined(SHLIB_NAME)

+.if defined(SHLIB_NAME) && !empty(SHLIB_NAME)

 .if ${MK_DEBUG_FILES} != "no"

 SHLIB_NAME_FULL=${SHLIB_NAME}.full

 # Use ${DEBUGDIR} for base system debug files, else .debug subdirectory

@@ -277,7 +277,7 @@ LDFLAGS+=	-Wl,--undefined-version

 .endif

 .endif

-.if defined(LIB) && !empty(LIB) || defined(SHLIB_NAME)

+.if defined(LIB) && !empty(LIB) || (defined(SHLIB_NAME) && !empty(SHLIB_NAME))

 OBJS+=		${SRCS:N*.h:${OBJS_SRCS_FILTER:ts:}:S/$/.o/}

 BCOBJS+=	${SRCS:N*.[hsS]:N*.asm:${OBJS_SRCS_FILTER:ts:}:S/$/.bco/g}

 LLOBJS+=	${SRCS:N*.[hsS]:N*.asm:${OBJS_SRCS_FILTER:ts:}:S/$/.llo/g}

@@ -320,14 +320,14 @@ lib${LIB_PRIVATE}${LIB}.ll: ${LLOBJS}

 CLEANFILES+=	lib${LIB_PRIVATE}${LIB}.bc lib${LIB_PRIVATE}${LIB}.ll

 .endif

-.if defined(SHLIB_NAME) || \

+.if (defined(SHLIB_NAME) && !empty(SHLIB_NAME)) || \

     defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB)

 SOBJS+=		${OBJS:.o=.pico}

 DEPENDOBJS+=	${SOBJS}

 CLEANFILES+=	${SOBJS}

 .endif

-.if defined(SHLIB_NAME)

+.if defined(SHLIB_NAME) && !empty(SHLIB_NAME)

 _LIBS+=		${SHLIB_NAME}

 SOLINKOPTS+=	-shared -Wl,-x

@@ -435,7 +435,7 @@ all: all-man

 CLEANFILES+=	${_LIBS}

 _EXTRADEPEND:

-.if !defined(NO_EXTRADEPEND) && defined(SHLIB_NAME)

+.if !defined(NO_EXTRADEPEND) && defined(SHLIB_NAME) && !empty(SHLIB_NAME)

 .if defined(DPADD) && !empty(DPADD)

 	echo ${SHLIB_NAME_FULL}: ${DPADD} >> ${DEPENDFILE}

 .endif

@@ -501,7 +501,7 @@ _libinstall:

	    ${_INSTALLFLAGS} lib${LIB_PRIVATE}${LIB}${_STATICLIB_SUFFIX}.a ${DESTDIR}${_LIBDIR}/

 .endif

 .endif

-.if defined(SHLIB_NAME)

+.if defined(SHLIB_NAME) && !empty(SHLIB_NAME)

	${INSTALL} ${LIB_TAG_ARGS} ${STRIP} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \

	    ${_INSTALLFLAGS} ${_SHLINSTALLFLAGS} \

	    ${SHLIB_NAME} ${DESTDIR}${_SHLIBDIR}/

@@ -588,7 +588,7 @@ OBJS_DEPEND_GUESS+= ${SRCS:M*.h}

 OBJS_DEPEND_GUESS.${_S:${OBJS_SRCS_FILTER:ts:}}.po+=	${_S}

 .endfor

 .endif

-.if defined(SHLIB_NAME) || \

+.if (defined(SHLIB_NAME) && !empty(SHLIB_NAME)) || \

     defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB)

 .for _S in ${SRCS:N*.[hly]}

 OBJS_DEPEND_GUESS.${_S:${OBJS_SRCS_FILTER:ts:}}.pico+=	${_S}

diff --git a/tools/build/Makefile b/tools/build/Makefile

index 948a5f9dfdb..592af84eeae 100644

--- a/tools/build/Makefile

+++ b/tools/build/Makefile

@@ -327,15 +327,15 @@ host-symlinks:

 # and cross-tools stages. We do this here using mkdir since mtree may not exist

 # yet (this happens if we are crossbuilding from Linux/Mac).

 INSTALLDIR_LIST= \

-	bin \

-	lib/geom \

-	usr/include/casper \

-	usr/include/openssl \

-	usr/include/private/ucl \

-	usr/include/private/zstd \

-	usr/lib \

-	usr/libdata/pkgconfig \

-	usr/libexec

+	${BINDIR} \

+	${LIBDIR}/geom \

+	${INCLUDEDIR}/casper \

+	${INCLUDEDIR}/openssl \

+	${INCLUDEDIR}/private/ucl \

+	${INCLUDEDIR}/private/zstd \

+	${LIBDIR} \

+	${LIBDIR}/libdata/pkgconfig \

+	${LIBEXECDIR}

 installdirs:

 	mkdir -p ${INSTALLDIR_LIST:S,^,${DESTDIR}/,}

@@ -352,9 +352,9 @@ installdirs:

 	    rm -rf "${DESTDIR}/${_dir}"; \

 	fi

 .endfor

-	ln -sfn bin ${DESTDIR}/sbin

-	ln -sfn ../bin ${DESTDIR}/usr/bin

-	ln -sfn ../bin ${DESTDIR}/usr/sbin

+	ln -sfn bin ${DESTDIR}/${SBINDIR}

+	ln -sfn ../bin ${DESTDIR}/${BINDIR}

+	ln -sfn ../bin ${DESTDIR}/${SBINDIR}

 .for _group in ${INCSGROUPS:NINCS}

 	mkdir -p "${DESTDIR}/${${_group}DIR}"

 .endfor

diff --git a/tools/build/cross-build/include/common/sys/types.h b/tools/build/cross-build/include/common/sys/types.h

index 18b607ed82d2..ee7692b31273 100644

--- a/tools/build/cross-build/include/common/sys/types.h

+++ b/tools/build/cross-build/include/common/sys/types.h

@@ -34,6 +34,7 @@

  * SUCH DAMAGE.

  */

 #pragma once

+#include <sys/cdefs.h>

 #include_next <sys/types.h>

 #include <sys/_types.h>

 /*