upstream/opnsense-tools
1
0
Fork 0
mirror of https://github.com/opnsense/tools.git synced 2026-06-09 08:55:26 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

build/ports: build aux.conf only as dependency

Browse source 
Avoids spurious build errors for lang/rust on early shared LibreSSL/OpenSSL
build on the same machine.  Also rebuilds benefit from this not wanting to
build rust at all if not necessary (go is not that bad).
This commit is contained in:
Franco Fichtner 2022-08-25 10:24:08 +02:00
parent 49f0544d66
commit da3cbc263e
1 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
build/ports.sh
View file

@ -56,14 +56,8 @@ if check_packages ${SELF} ${ARGS}; then
exit 0
fi
PORTCONFIGS="${CONFIGDIR}/ports.conf"
# inject auxiliary ports only if not already removed
if ! check_packages packages; then
PORTCONFIGS="${CONFIGDIR}/aux.conf ${PORTCONFIGS}"
fi
PORTSLIST=$(list_ports ${PORTCONFIGS})
PORTSLIST=$(list_ports ${CONFIGDIR}/ports.conf)
AUXLIST=$(list_ports ${CONFIGDIR}/aux.conf)
git_branch ${SRCDIR} ${SRCBRANCH} SRCBRANCH
git_branch ${PORTSDIR} ${PORTSBRANCH} PORTSBRANCH
@ -187,7 +181,7 @@ UNAME_r=\$(freebsd-version)
pkg create -no ${PACKAGESDIR}-cache/All \${PKGNAME}
done
echo "${PORTSLIST}" | while read PORT_DEPENDS; do
(echo "${PORTSLIST}"; echo "${AUXLIST}") | while read PORT_DEPENDS; do
PORT_DEPNAME=\$(pkg query -e "%o == \${PORT_DEPENDS%%@*}" %n)
if [ -n "\${PORT_DEPNAME}" ]; then
echo ">>> Locking package dependency: \${PORT_DEPNAME}"