D56270.id174963.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D56270.id174963.diff
View Options

	diff --git a/Makefile.inc1 b/Makefile.inc1
	--- a/Makefile.inc1
	+++ b/Makefile.inc1
	@@ -2614,17 +2614,11 @@
	_kldxref= usr.sbin/kldxref
	${_bt}-usr.sbin/kldxref: ${_bt_libelf_depend} ${_bt_libkldelf_depend}

	-# flua is required to regenerate syscall files. It first appeared during the
	-# 13.0-CURRENT cycle, thus needs to be built on -older releases and stable
	-# branches.
	-.if ${BOOTSTRAPPING} < 1300059
	+# flua is required to regenerate syscall files, and for the pkgbase build.
	+# To protect us from changes in newer versions of flua or lua libraries
	+# that might be installed on the host, always bootstrap it.
	${_bt}-libexec/flua: ${_bt}-lib/liblua
	-_flua= lib/liblua libexec/flua
	-.if ${BOOTSTRAPPING} == 0
	-_flua+= lib/libmd lib/libucl lib/libyaml
	${_bt}-libexec/flua: ${_bt}-lib/libmd ${_bt}-lib/libucl ${_bt}-lib/libyaml
	-.endif # BOOTSTRAPPING == 0
	-.endif

	# r245440 mtree -N support added
	# r313404 requires sha384.h for libnetbsd, added to libmd in r292782
	@@ -2911,7 +2905,11 @@
	${_elftoolchain_libs} \
	${_libkldelf} \
	${_kldxref} \
	+ lib/liblua \
	+ lib/libmd \
	lib/libopenbsd \
	+ lib/libucl \
	+ lib/libyaml \
	usr.bin/mandoc \
	usr.bin/rpcgen \
	${_yacc} \
	@@ -2921,7 +2919,7 @@
	usr.bin/xinstall \
	${_gensnmptree} \
	usr.sbin/config \
	- ${_flua} \
	+ libexec/flua \
	${_crunchide} \
	${_crunchgen} \
	${_etdump} \