macos: properly set GL_SILENCE_DEPRECATION when building gtkglext

[xonotic/netradiant.git] / easy-builder

diff --git a/easy-builder b/easy-builder
index fb7cabc83bbeec7fab0089b8bfd6d0412bc80d09..6d1d971843819e5b957990db64c735464882adf6 100755 (executable)
--- a/easy-builder
+++ b/easy-builder
@@ -14,6 +14,11 @@ install_dir="${project_source_dir}/install${SUBDIR:+/${SUBDIR}}"
 install_target='install/strip'
 build_type='Release'
 
+if [ "$(uname -s)" = 'FreeBSD' ]
+then
+       install_target='install'
+fi
+
 _job_count=4
 
 _nproc () {
@@ -87,28 +92,49 @@ case "$(uname -s)" in
                ;;
 esac
 
+task_enter_build_dir () {
+       mkdir -pv "${build_dir}"
+       cd "${build_dir}"
+}
+
+task_fetch_submodules () {
+       "${fetch_submodules_cmd[@]}"
+}
+
+task_configure () {
+       cmake \
+               -G'Unix Makefiles' \
+               -D'CMAKE_INSTALL_PREFIX'="${install_dir}" \
+               -D'CMAKE_BUILD_TYPE'="${build_type}" \
+               "${cmake_user_opts[@]}" \
+               "${project_source_dir}"
+}
+
+task_build_builtins () {
+       cmake \
+               --build "${build_dir}" \
+               -- \
+               -j"${job_count}" \
+               'builtins'
+}
+
+task_build () {
+       cmake \
+               --build "${build_dir}" \
+               -- \
+               -j"${job_count}" \
+               "${install_target}"
+}
+
 set -x
 
-"${fetch_submodules_cmd[@]}"
-
-mkdir -pv "${build_dir}"
-cd "${build_dir}"
-
-cmake \
-       -G'Unix Makefiles' \
-       -D'CMAKE_INSTALL_PREFIX'="${install_dir}" \
-       -D'CMAKE_BUILD_TYPE'="${build_type}" \
-       "${cmake_user_opts[@]}" \
-       "${project_source_dir}"
-
-cmake \
-       --build "${build_dir}" \
-       -- \
-       -j"${job_count}" \
-       'builtins'
-
-cmake \
-       --build "${build_dir}" \
-       -- \
-       -j"${job_count}" \
-       "${install_target}"
+task_enter_build_dir
+
+task_configure
+
+task_build_builtins
+
+# Sometime linking fails on macOS with this message:
+#   ld: symbol(s) not found for architecture x86_64
+# and restarting the build process just work.
+task_build || task_build