1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 08:27:45 +00:00

Ports: Only do build check for configure, build, and install steps

This was breaking ports linting, which runs the script with the
'showproperty' option. This check is not needed for some other options
as well, so let's do it conditionally.
This commit is contained in:
Linus Groh 2021-05-20 20:04:40 +01:00
parent 54f6ac1854
commit c1b2813ddf

View file

@ -50,15 +50,6 @@ host_env() {
enable_ccache enable_ccache
} }
# Sanity check.
if [ ! -f "${DESTDIR}/usr/lib/libc.so" ]; then
echo "libc.so could not be found. This likely means that SerenityOS:"
echo "- has not been built and/or installed yet"
echo "- has been installed in an unexpected location"
echo "The currently configured build directory is ${SERENITY_BUILD_DIR}. Resolve this issue and try again."
exit 1
fi
packagesdb="${DESTDIR}/usr/Ports/packages.db" packagesdb="${DESTDIR}/usr/Ports/packages.db"
. "$@" . "$@"
@ -83,13 +74,27 @@ run_nocd() {
echo "+ $@ (nocd)" echo "+ $@ (nocd)"
("$@") ("$@")
} }
run() { run() {
echo "+ $@" echo "+ $@"
(cd "$workdir" && "$@") (cd "$workdir" && "$@")
} }
run_replace_in_file() { run_replace_in_file() {
run perl -p -i -e "$1" $2 run perl -p -i -e "$1" $2
} }
ensure_build() {
# Sanity check.
if [ ! -f "${DESTDIR}/usr/lib/libc.so" ]; then
echo "libc.so could not be found. This likely means that SerenityOS:"
echo "- has not been built and/or installed yet"
echo "- has been installed in an unexpected location"
echo "The currently configured build directory is ${SERENITY_BUILD_DIR}. Resolve this issue and try again."
exit 1
fi
}
install_launcher() { install_launcher() {
if [ -z "$launcher_name" ] || [ -z "${launcher_category}" ] || [ -z "${launcher_command}" ]; then if [ -z "$launcher_name" ] || [ -z "${launcher_category}" ] || [ -z "${launcher_command}" ]; then
return return
@ -374,6 +379,7 @@ do_patch() {
patch_internal patch_internal
} }
do_configure() { do_configure() {
ensure_build
if [ "$useconfigure" = "true" ]; then if [ "$useconfigure" = "true" ]; then
echo "Configuring $port!" echo "Configuring $port!"
pre_configure pre_configure
@ -384,10 +390,12 @@ do_configure() {
fi fi
} }
do_build() { do_build() {
ensure_build
echo "Building $port!" echo "Building $port!"
build build
} }
do_install() { do_install() {
ensure_build
echo "Installing $port!" echo "Installing $port!"
install install
post_install post_install