From aed3e003e0199887cd6b0e38b41394f6323c546a Mon Sep 17 00:00:00 2001
From: valord577 <30427460+valord577@users.noreply.github.com>
Date: Tue, 10 Dec 2024 20:43:40 +0800
Subject: [PATCH] update scripts (#16)

---
 .github/matrix_container.json                 | 15 ++++++---
 .github/workflows/_matrix.yml                 |  6 ++++
 .github/workflows/ffmpeg.yml                  |  1 +
 build.sh                                      |  9 ++++++
 crossbuild_linux_gnueabihf_armv7.sh           |  1 +
 deps/mbedtls                                  |  2 +-
 deps/sdl2                                     |  2 +-
 env-apple.sh                                  | 14 ++++----
 env-linux-cross.sh                            | 15 +++++++--
 env-linux-native.sh                           | 21 ++++++++++--
 env-mingw.sh                                  |  6 ++--
 env-msvc.ps1                                  |  4 +--
 .../mbedtls/01_fix_cross_shared_build.patch   | 12 -------
 pkg-conf.sh                                   | 27 ++++++++++++----
 scripts/ffmpeg.sh                             | 32 +++++++------------
 scripts/llvm.ps1                              |  2 +-
 scripts/llvm.sh                               | 10 +-----
 scripts/mbedtls.sh                            | 10 +-----
 scripts/sdl2.sh                               | 10 +-----
 19 files changed, 111 insertions(+), 88 deletions(-)
 create mode 120000 crossbuild_linux_gnueabihf_armv7.sh
 delete mode 100644 patches/mbedtls/01_fix_cross_shared_build.patch

diff --git a/.github/matrix_container.json b/.github/matrix_container.json
index d82b77e..35b8a5b 100644
--- a/.github/matrix_container.json
+++ b/.github/matrix_container.json
@@ -4,27 +4,34 @@
     "arch": "amd64",
     "pkg_type": "static",
     "lib_impl": "gnu",
-    "image": "valord577/linux-cross:6a5d9b8db8c21b39d1655aa536d7566f5512e967"
+    "image": "valord577/linux-cross:d62159e85069a9c141b90f1429600183908c0f90"
   },
   {
     "platform": "linux",
     "arch": "arm64",
     "pkg_type": "static",
     "lib_impl": "gnu",
-    "image": "valord577/linux-cross:6a5d9b8db8c21b39d1655aa536d7566f5512e967"
+    "image": "valord577/linux-cross:d62159e85069a9c141b90f1429600183908c0f90"
+  },
+  {
+    "platform": "linux",
+    "arch": "armv7",
+    "pkg_type": "static",
+    "lib_impl": "gnueabihf",
+    "image": "valord577/linux-cross:d62159e85069a9c141b90f1429600183908c0f90"
   },
   {
     "platform": "linux",
     "arch": "amd64",
     "pkg_type": "static",
     "lib_impl": "musl",
-    "image": "valord577/linux-cross:6a5d9b8db8c21b39d1655aa536d7566f5512e967"
+    "image": "valord577/linux-cross:d62159e85069a9c141b90f1429600183908c0f90"
   },
   {
     "platform": "linux",
     "arch": "arm64",
     "pkg_type": "static",
     "lib_impl": "musl",
-    "image": "valord577/linux-cross:6a5d9b8db8c21b39d1655aa536d7566f5512e967"
+    "image": "valord577/linux-cross:d62159e85069a9c141b90f1429600183908c0f90"
   }
 ]
diff --git a/.github/workflows/_matrix.yml b/.github/workflows/_matrix.yml
index e66c2ac..51b358c 100644
--- a/.github/workflows/_matrix.yml
+++ b/.github/workflows/_matrix.yml
@@ -14,6 +14,10 @@ on:
         default: false
         required: false
         type: boolean
+      allow_failure:
+        default: false
+        required: false
+        type: boolean
 
 env:
   GH_TOKEN: ${{ github.token }}
@@ -71,6 +75,7 @@ jobs:
     strategy:
       matrix: ${{ fromJson(needs._preset.outputs.matrix) }}
     runs-on: ${{ matrix.os }}
+    continue-on-error: ${{ inputs.allow_failure }}
     defaults:
       run:
         shell: ${{ startsWith(matrix.os, 'windows') && 'pwsh' || 'bash' }}
@@ -122,6 +127,7 @@ jobs:
     strategy:
       matrix: ${{ fromJson(needs._preset.outputs.matrix-container) }}
     runs-on: ubuntu-latest
+    continue-on-error: ${{ inputs.allow_failure }}
     container:
       image: ${{ matrix.image }}
     defaults:
diff --git a/.github/workflows/ffmpeg.yml b/.github/workflows/ffmpeg.yml
index a9d03c2..d347223 100644
--- a/.github/workflows/ffmpeg.yml
+++ b/.github/workflows/ffmpeg.yml
@@ -33,4 +33,5 @@ jobs:
     secrets: inherit
     uses: ./.github/workflows/_matrix.yml
     with:
+      allow_failure: true
       disable_upload: true
diff --git a/build.sh b/build.sh
index c3ee330..c211a0f 100755
--- a/build.sh
+++ b/build.sh
@@ -82,6 +82,15 @@ function compile() {
       popd
     fi
     bash "${PROJ_ROOT}/scripts/${PKG_NAME}.sh"
+
+
+    if [ "${CLANGD_CODE_COMPLETION}" != "1" ]; then
+      { command -v tree >/dev/null 2>&1; } \
+        && { tree -L 3 ${PKG_INST_DIR}; }  \
+        || { ls -alh -- ${PKG_INST_DIR}; }
+    fi
+    BUILD_DATE=$(date -u '+%Y-%m-%dT%H:%M:%SZ%:z')
+    printf "\e[1m\e[35m%s\e[0m\n" "${SUBPROJ_SRC} - Build Done @${BUILD_DATE}"
   )
 }
 
diff --git a/crossbuild_linux_gnueabihf_armv7.sh b/crossbuild_linux_gnueabihf_armv7.sh
new file mode 120000
index 0000000..c07a74d
--- /dev/null
+++ b/crossbuild_linux_gnueabihf_armv7.sh
@@ -0,0 +1 @@
+build.sh
\ No newline at end of file
diff --git a/deps/mbedtls b/deps/mbedtls
index 71c569d..107ea89 160000
--- a/deps/mbedtls
+++ b/deps/mbedtls
@@ -1 +1 @@
-Subproject commit 71c569d44bf3a8bd53d874c81ee8ac644dd6e9e3
+Subproject commit 107ea89daaefb9867ea9121002fbbdf926780e98
diff --git a/deps/sdl2 b/deps/sdl2
index 9519b99..9c821dc 160000
--- a/deps/sdl2
+++ b/deps/sdl2
@@ -1 +1 @@
-Subproject commit 9519b9916cd29a14587af0507292f2bd31dd5752
+Subproject commit 9c821dc21ccbd69b2bda421fdb35cb4ae2da8f5e
diff --git a/env-apple.sh b/env-apple.sh
index b4c763d..597cd5b 100755
--- a/env-apple.sh
+++ b/env-apple.sh
@@ -32,20 +32,20 @@ export PARALLEL_JOBS="$(sysctl -n hw.ncpu)"
 if command -v ccache >/dev/null 2>&1 ; then
   export CCACHE_SRC="$(command -v ccache)"
 
-  export CMAKE_EXTRA_ARGS="${CMAKE_EXTRA_ARGS} -D CMAKE_C_COMPILER_LAUNCHER=ccache"
-  export CMAKE_EXTRA_ARGS="${CMAKE_EXTRA_ARGS} -D CMAKE_CXX_COMPILER_LAUNCHER=ccache"
-  export CMAKE_EXTRA_ARGS="${CMAKE_EXTRA_ARGS} -D CMAKE_OBJC_COMPILER_LAUNCHER=ccache"
-  export CMAKE_EXTRA_ARGS="${CMAKE_EXTRA_ARGS} -D CMAKE_OBJCXX_COMPILER_LAUNCHER=ccache"
+  export CMAKE_EXTRA="${CMAKE_EXTRA} -D CMAKE_C_COMPILER_LAUNCHER=ccache"
+  export CMAKE_EXTRA="${CMAKE_EXTRA} -D CMAKE_CXX_COMPILER_LAUNCHER=ccache"
+  export CMAKE_EXTRA="${CMAKE_EXTRA} -D CMAKE_OBJC_COMPILER_LAUNCHER=ccache"
+  export CMAKE_EXTRA="${CMAKE_EXTRA} -D CMAKE_OBJCXX_COMPILER_LAUNCHER=ccache"
 fi
 
-export CMAKE_EXTRA_ARGS=$(cat <<- EOF
+export CMAKE_EXTRA=$(cat <<- EOF
 -D CMAKE_OSX_ARCHITECTURES=${TARGET_ARCH} \
 -D CMAKE_OSX_SYSROOT=${TARGET_PLATFORM} \
 -D CMAKE_OSX_DEPLOYMENT_TARGET=${TARGET_DEPLOYMENT} \
--D CMAKE_MACOSX_BUNDLE:BOOL=0 ${CMAKE_EXTRA_ARGS}
+-D CMAKE_MACOSX_BUNDLE:BOOL=0 ${CMAKE_EXTRA}
 EOF
 )
 if [ "${TARGET_PLATFORM}" == "iphoneos" ] || \
   [ "${TARGET_PLATFORM}" == "iphonesimulator" ]; then
-  export CMAKE_EXTRA_ARGS="-D CMAKE_SYSTEM_NAME=iOS ${CMAKE_EXTRA_ARGS}"
+  export CMAKE_EXTRA="-D CMAKE_SYSTEM_NAME=iOS ${CMAKE_EXTRA}"
 fi
diff --git a/env-linux-cross.sh b/env-linux-cross.sh
index dc41f98..6b40e63 100755
--- a/env-linux-cross.sh
+++ b/env-linux-cross.sh
@@ -34,7 +34,7 @@ if [ -z "${CROSS_TOOLCHAIN_ROOT}" ]; then
   printf "\e[1m\e[31m%s\e[0m\n" "Blank CROSS_TOOLCHAIN_ROOT: '${CROSS_TOOLCHAIN_ROOT}'."
   exit 1
 fi
-export SYSROOT="${CROSS_TOOLCHAIN_ROOT}/${TARGET_TRIPLE}/sysroot"
+export SYSROOT="${CROSS_TOOLCHAIN_ROOT}/${TARGET_TRIPLE}"
 
 # cmake toolchain file
 if [ -z "${CROSS_TOOLCHAIN_FILE_PREFIX_CMAKE}" ]; then
@@ -42,6 +42,12 @@ if [ -z "${CROSS_TOOLCHAIN_FILE_PREFIX_CMAKE}" ]; then
 fi
 CROSS_TOOLCHAIN_FILE_CMAKE="${CROSS_TOOLCHAIN_FILE_PREFIX_CMAKE}.${TARGET_TRIPLE}"
 export CMAKE_EXTRA="${CMAKE_EXTRA} -D CMAKE_TOOLCHAIN_FILE=${CROSS_TOOLCHAIN_FILE_CMAKE}"
+# meson toolchain file
+if [ -z "${CROSS_TOOLCHAIN_FILE_PREFIX_MESON}" ]; then
+  CROSS_TOOLCHAIN_FILE_PREFIX_MESON="${CROSS_TOOLCHAIN_ROOT}/toolchain-meson-template"
+fi
+CROSS_TOOLCHAIN_FILE_MESON="${CROSS_TOOLCHAIN_FILE_PREFIX_MESON}.${TARGET_TRIPLE}"
+export MESON_EXTRA="${MESON_EXTRA} --cross-file ${CROSS_TOOLCHAIN_FILE_MESON}"
 # pkgconf bin
 if [ -z "${CROSS_TOOLCHAIN_PKGCONF_PREFIX}" ]; then
   CROSS_TOOLCHAIN_PKGCONF_PREFIX="${CROSS_TOOLCHAIN_ROOT}/pkgconf-wrapper"
@@ -57,8 +63,13 @@ export AR="$(command -v llvm-ar)";
 export AS="$(command -v llvm-as)";
 export RANLIB="$(command -v llvm-ranlib)";
 export STRIP="$(command -v llvm-strip)";
+export READELF="$(command -v llvm-readelf)";
 
-export CROSS_FLAGS="--target=${TARGET_TRIPLE} --gcc-toolchain=${CROSS_TOOLCHAIN_ROOT} -Wno-unused-command-line-argument -fuse-ld=${LD} --sysroot=${SYSROOT}"
+export CROSS_FLAGS="--target=${TARGET_TRIPLE} --gcc-toolchain=${SYSROOT}/usr --sysroot=${SYSROOT}"
+if [ "${TARGET_ARCH}" == "armv7" ]; then
+  export CROSS_FLAGS="${CROSS_FLAGS} -march=armv7-a -mfpu=neon-vfpv4"
+fi
+export CROSS_LDFLAGS="-fuse-ld=${LD} --sysroot=${SYSROOT}"
 export CC="$(command -v clang) ${CROSS_FLAGS}";
 export CXX="$(command -v clang++) ${CROSS_FLAGS}";
 export CPP="$(command -v clang-cpp) ${CROSS_FLAGS}";
diff --git a/env-linux-native.sh b/env-linux-native.sh
index d563b3c..ddff156 100755
--- a/env-linux-native.sh
+++ b/env-linux-native.sh
@@ -14,12 +14,29 @@ case "$(uname -m)" in
     ;;
 esac
 
+# check libc implementation
+if ! command -v ldd >/dev/null 2>&1 ; then
+  printf "\e[1m\e[31m%s\e[0m\n" "Unknown exec 'ldd'."
+  exit 1
+fi
+libc_is_musl=$(ldd --version | grep 'musl' 2>&1 >/dev/null; echo $?)
+if [ "${libc_is_musl}" == "0" ]; then
+  export TARGET_LIBC="musl"
+else
+  if [ "${TARGET_ARCH}" == "armv7" ]; then
+    export TARGET_LIBC="gnueabihf"
+  else
+    export TARGET_LIBC="gnu"
+  fi
+fi
+
+
 export PARALLEL_JOBS="$(nproc)"
 if command -v ccache >/dev/null 2>&1 ; then
   export CCACHE_SRC="$(command -v ccache)"
 
-  export CMAKE_EXTRA_ARGS="${CMAKE_EXTRA_ARGS} -D CMAKE_C_COMPILER_LAUNCHER=ccache"
-  export CMAKE_EXTRA_ARGS="${CMAKE_EXTRA_ARGS} -D CMAKE_CXX_COMPILER_LAUNCHER=ccache"
+  export CMAKE_EXTRA="${CMAKE_EXTRA} -D CMAKE_C_COMPILER_LAUNCHER=ccache"
+  export CMAKE_EXTRA="${CMAKE_EXTRA} -D CMAKE_CXX_COMPILER_LAUNCHER=ccache"
 fi
 
 function chk_compiler() {
diff --git a/env-mingw.sh b/env-mingw.sh
index 8d3a405..ba3cd5f 100755
--- a/env-mingw.sh
+++ b/env-mingw.sh
@@ -31,7 +31,7 @@ fi
 export SYSROOT="${CROSS_TOOLCHAIN_ROOT}/${__TARGET_TRIPLE__}"
 
 export PARALLEL_JOBS="$(nproc)"
-export CMAKE_EXTRA_ARGS="${CMAKE_EXTRA_ARGS} -D CMAKE_TOOLCHAIN_FILE=${CROSS_TOOLCHAIN_FILE_CMAKE}"
+export CMAKE_EXTRA="${CMAKE_EXTRA} -D CMAKE_TOOLCHAIN_FILE=${CROSS_TOOLCHAIN_FILE_CMAKE}"
 
 # for cross-compiling, cmake sets compiler vars by toolchain file, so keep CC/CXX.
 export CC="${CROSS_TOOLCHAIN_ROOT}/bin/${__TARGET_TRIPLE__}-clang"
@@ -46,6 +46,6 @@ export STRIP="${CROSS_TOOLCHAIN_ROOT}/bin/${__TARGET_TRIPLE__}-strip"
 if command -v ccache >/dev/null 2>&1 ; then
   export CCACHE_SRC="$(command -v ccache)"
 
-  export CMAKE_EXTRA_ARGS="${CMAKE_EXTRA_ARGS} -D CMAKE_C_COMPILER_LAUNCHER=ccache"
-  export CMAKE_EXTRA_ARGS="${CMAKE_EXTRA_ARGS} -D CMAKE_CXX_COMPILER_LAUNCHER=ccache"
+  export CMAKE_EXTRA="${CMAKE_EXTRA} -D CMAKE_C_COMPILER_LAUNCHER=ccache"
+  export CMAKE_EXTRA="${CMAKE_EXTRA} -D CMAKE_CXX_COMPILER_LAUNCHER=ccache"
 fi
diff --git a/env-msvc.ps1 b/env-msvc.ps1
index f2bc7a5..08ac1be 100644
--- a/env-msvc.ps1
+++ b/env-msvc.ps1
@@ -11,8 +11,8 @@ if ($ccache -ne $null) {
   ${env:CCACHE_SRC} = "$($ccache.Source)"
 
   # https://github.com/ccache/ccache/discussions/978
-  ${env:CMAKE_EXTRA_ARGS} = "${env:CMAKE_EXTRA_ARGS} -D CMAKE_C_COMPILER_LAUNCHER=`"${env:CCACHE_SRC}`""
-  ${env:CMAKE_EXTRA_ARGS} = "${env:CMAKE_EXTRA_ARGS} -D CMAKE_CXX_COMPILER_LAUNCHER=`"${env:CCACHE_SRC}`""
+  ${env:CMAKE_EXTRA} = "${env:CMAKE_EXTRA} -D CMAKE_C_COMPILER_LAUNCHER=`"${env:CCACHE_SRC}`""
+  ${env:CMAKE_EXTRA} = "${env:CMAKE_EXTRA} -D CMAKE_CXX_COMPILER_LAUNCHER=`"${env:CCACHE_SRC}`""
 }
 
 # >>> VS DevShell >>>
diff --git a/patches/mbedtls/01_fix_cross_shared_build.patch b/patches/mbedtls/01_fix_cross_shared_build.patch
deleted file mode 100644
index a782c86..0000000
--- a/patches/mbedtls/01_fix_cross_shared_build.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5f5afb212..362488c51 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -239,6 +239,7 @@ endif(CMAKE_COMPILER_IS_GNU)
- 
- if(CMAKE_COMPILER_IS_CLANG)
-     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wwrite-strings -Wmissing-prototypes -Wpointer-arith -Wimplicit-fallthrough -Wshadow -Wvla -Wformat=2 -Wno-format-nonliteral")
-+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-fuse-ld-path")
-     set(CMAKE_C_FLAGS_RELEASE     "-O2")
-     set(CMAKE_C_FLAGS_DEBUG       "-O0 -g3")
-     set(CMAKE_C_FLAGS_COVERAGE    "-O0 -g3 --coverage")
diff --git a/pkg-conf.sh b/pkg-conf.sh
index 27f19a2..155e2c0 100755
--- a/pkg-conf.sh
+++ b/pkg-conf.sh
@@ -5,9 +5,6 @@ if [ -n "${CROSS_TOOLCHAIN_PKGCONF}" ]; then
   export PKG_CONFIG_EXEC="${CROSS_TOOLCHAIN_PKGCONF}"
 fi
 
-if [ -z "${PROJ_ROOT}" ]; then
-  PROJ_ROOT=$(cd "$(dirname ${BASH_SOURCE[0]})"; pwd)
-fi
 dep_libs_dir="${PROJ_ROOT}/lib"
 if [ ! -e "${dep_libs_dir}" ]; then { mkdir -p "${dep_libs_dir}"; } fi
 
@@ -43,8 +40,26 @@ function dl_pkgc() {
   fi
 
   export PKG_DEPS_ARGS="${PKG_DEPS_ARGS} ${5}"
-  if [ "${3}" == "shared" ]; then { export PKG_DEPS_SHARED="${PKG_DEPS_SHARED} ${1}"; } fi
-
-  export PKG_DEPS_CMAKE="${dep_libs_dir}/${1};${PKG_DEPS_CMAKE}"
   export PKG_CONFIG_PATH="${dep_libs_dir}/${1}/lib/pkgconfig:${PKG_CONFIG_PATH}"
+
+  # mark libraries (shared static)
+  #  - PKG_DEPS_SHARED
+  #  - PKG_DEPS_STATIC
+  _pkg_type_=$(echo ${3} | tr "[:lower:]" "[:upper:]") # fixed: run on macos zsh
+  eval export "PKG_DEPS_${_pkg_type_}=\"\${PKG_DEPS_${_pkg_type_}} ${dep_libs_dir}/${1}\""
+
+  # https://cmake.org/cmake/help/latest/variable/CMAKE_MODULE_PATH.html
+  cmake_search_path="${dep_libs_dir}/${1}"
+  if [ -n "${6}" ]; then
+    cmake_search_path="${dep_libs_dir}/${1}/${6}"
+  fi
+  export PKG_DEPS_CMAKE="${cmake_search_path};${PKG_DEPS_CMAKE}"
+
+  # for shared library's own dependencies
+  if [ -n "${7}" ]; then
+    triplet_values=(${7//:/ })
+    for path in ${triplet_values[@]}; do
+      export LD_LIBRARY_PATH="${dep_libs_dir}/${1}/${path}:${LD_LIBRARY_PATH}"
+    done
+  fi
 }
diff --git a/scripts/ffmpeg.sh b/scripts/ffmpeg.sh
index abd02b2..d6474f5 100755
--- a/scripts/ffmpeg.sh
+++ b/scripts/ffmpeg.sh
@@ -40,12 +40,13 @@ fi
 # ----------------------------
 # compile :p
 # ----------------------------
-{ rm -rf ${PKG_BULD_DIR}; mkdir -p "${PKG_BULD_DIR}"; }
-{ rm -rf ${PKG_INST_DIR}; mkdir -p "${PKG_INST_DIR}"; }
-
-if [ "${CLANGD_CODE_COMPLETION}" == "1" ]; then { PKG_BULD_DIR="${SUBPROJ_SRC}"; } fi
+if [ "${CLANGD_CODE_COMPLETION}" == "1" ]; then
+  PKG_BULD_DIR="${PROJ_ROOT}"
+else
+  { rm -rf ${PKG_BULD_DIR}; mkdir -p "${PKG_BULD_DIR}"; }
+  { rm -rf ${PKG_INST_DIR}; mkdir -p "${PKG_INST_DIR}"; }
+fi
 
-pushd -- "${PKG_BULD_DIR}"
 CONFIGURE_COMMAND=$(cat <<- EOF
 ${SUBPROJ_SRC}/configure     \
   --prefix='${PKG_INST_DIR}' \
@@ -81,8 +82,8 @@ case ${PKG_PLATFORM} in
   "linux")
     if [ "${CROSS_BUILD_ENABLED}" == "1" ]; then
       CONFIGURE_COMMAND="${CONFIGURE_COMMAND} \
-        --enable-cross-compile --target-os=linux --arch=${PKG_ARCH} \
-        --host-cc='${HOSTCC}' --nm='${NM}' --ar='${AR}' --ranlib='${RANLIB}' --strip='${STRIP}'"
+        --enable-cross-compile --target-os=linux --arch=${PKG_ARCH} --host-cc='${HOSTCC}' \
+        --extra-ldflags='${CROSS_LDFLAGS}' --nm='${NM}' --ar='${AR}' --ranlib='${RANLIB}' --strip='${STRIP}'"
     fi
     ;;
   "win-mingw")
@@ -94,11 +95,10 @@ case ${PKG_PLATFORM} in
     ;;
 esac
 
-printf "\e[1m\e[36m%s\e[0m\n" "${CONFIGURE_COMMAND}"; eval ${CONFIGURE_COMMAND}
-popd
+printf "\e[1m\e[36m%s\e[0m\n" "${CONFIGURE_COMMAND}"
+pushd -- "${PKG_BULD_DIR}"; eval ${CONFIGURE_COMMAND}; popd
 
 # build & install
-pushd -- "${PKG_BULD_DIR}"
 MAKE_COMMAND="make -j ${PARALLEL_JOBS}"
 if [ "${PKG_PLATFORM}" == "iphoneos" ] || \
   [ "${PKG_PLATFORM}" == "iphonesimulator" ]; then
@@ -113,17 +113,9 @@ fi
 if command -v bear >/dev/null 2>&1 ; then
   MAKE_COMMAND="bear -- ${MAKE_COMMAND}"
 fi
-printf "\e[1m\e[36m%s\e[0m\n" "${MAKE_COMMAND}"; eval ${MAKE_COMMAND}
-popd
+printf "\e[1m\e[36m%s\e[0m\n" "${MAKE_COMMAND}"
+pushd -- "${PKG_BULD_DIR}"; eval ${MAKE_COMMAND}; popd
 
 if [ "${PKG_PLATFORM}" == "macosx" ]; then
   xattr -dr com.apple.quarantine ${PKG_INST_DIR}/bin/*
 fi
-
-if command -v tree >/dev/null 2>&1 ; then
-  tree -L 3 ${PKG_INST_DIR}
-else
-  ls -alh -- ${PKG_INST_DIR}
-fi
-BUILD_DATE=$(date -u '+%Y-%m-%dT%H:%M:%SZ%:z')
-printf "\e[1m\e[35m%s\e[0m\n" "${SUBPROJ_SRC} - Build Done @${BUILD_DATE}"
diff --git a/scripts/llvm.ps1 b/scripts/llvm.ps1
index d6bca13..9f7daee 100644
--- a/scripts/llvm.ps1
+++ b/scripts/llvm.ps1
@@ -85,7 +85,7 @@ cmake -G Ninja ``
   -D CMAKE_INSTALL_LIBDIR:PATH=lib ``
   ${PKG_BULD_TYPE} ``
   ${PKG_TYPE_FLAG} ``
-  ${env:CMAKE_EXTRA_ARGS} ``
+  ${env:CMAKE_EXTRA} ``
   -D LLVM_ENABLE_PROJECTS="clang;clang-tools-extra;lldb" ``
   -D CLANG_PLUGIN_SUPPORT:BOOL=0 ``
   -D LLVM_APPEND_VC_REV:BOOL=0 ``
diff --git a/scripts/llvm.sh b/scripts/llvm.sh
index 23f3e2d..575262d 100755
--- a/scripts/llvm.sh
+++ b/scripts/llvm.sh
@@ -67,7 +67,7 @@ cmake -G Ninja \
   -D CMAKE_EXPORT_COMPILE_COMMANDS:BOOL=ON \
   -D CMAKE_INSTALL_PREFIX="${PKG_INST_DIR}" \
   -D CMAKE_INSTALL_LIBDIR:PATH=lib \
-  ${PKG_BULD_TYPE} ${PKG_TYPE_FLAG} ${CMAKE_EXTRA_ARGS} \
+  ${PKG_BULD_TYPE} ${PKG_TYPE_FLAG} ${CMAKE_EXTRA} \
   -D LLVM_ENABLE_PROJECTS="clang;clang-tools-extra;lldb" \
   -D CLANG_PLUGIN_SUPPORT:BOOL=0 \
   -D LLVM_APPEND_VC_REV:BOOL=0 \
@@ -86,11 +86,3 @@ printf "\e[1m\e[36m%s\e[0m\n" "${CMAKE_COMMAND}"; eval ${CMAKE_COMMAND}
 # build & install
 cmake --build "${PKG_BULD_DIR}"
 cmake --install "${PKG_BULD_DIR}" ${PKG_INST_STRIP}
-
-if command -v tree >/dev/null 2>&1 ; then
-  tree -L 3 ${PKG_INST_DIR}
-else
-  ls -alh -- ${PKG_INST_DIR}
-fi
-BUILD_DATE=$(date -u '+%Y-%m-%dT%H:%M:%SZ%:z')
-printf "\e[1m\e[35m%s\e[0m\n" "${SUBPROJ_SRC} - Build Done @${BUILD_DATE}"
diff --git a/scripts/mbedtls.sh b/scripts/mbedtls.sh
index c0af096..56c13f4 100755
--- a/scripts/mbedtls.sh
+++ b/scripts/mbedtls.sh
@@ -88,7 +88,7 @@ cmake -S "${SUBPROJ_SRC}" -B "${PKG_BULD_DIR}" \
   -D CMAKE_INSTALL_PREFIX="${PKG_INST_DIR}" \
   -D CMAKE_INSTALL_LIBDIR:PATH=lib \
   ${PKG_BULD_TYPE} ${PKG_TYPE_FLAG} \
-  -D MBEDTLS_AS_SUBPROJECT:BOOL=1 ${CMAKE_EXTRA_ARGS} \
+  -D MBEDTLS_AS_SUBPROJECT:BOOL=1 ${CMAKE_EXTRA} \
   -D ENABLE_PROGRAMS:BOOL=0 -D ENABLE_TESTING:BOOL=0
 EOF
 )
@@ -111,11 +111,3 @@ Version:
 Libs: -L\${libdir} ${PKG_LIBRARY_DEPS}
 Cflags: -I\${includedir}
 EOF
-
-if command -v tree >/dev/null 2>&1 ; then
-  tree -L 3 ${PKG_INST_DIR}
-else
-  ls -alh -- ${PKG_INST_DIR}
-fi
-BUILD_DATE=$(date -u '+%Y-%m-%dT%H:%M:%SZ%:z')
-printf "\e[1m\e[35m%s\e[0m\n" "${SUBPROJ_SRC} - Build Done @${BUILD_DATE}"
diff --git a/scripts/sdl2.sh b/scripts/sdl2.sh
index f7024b0..b5330da 100755
--- a/scripts/sdl2.sh
+++ b/scripts/sdl2.sh
@@ -38,7 +38,7 @@ cmake -S "${SUBPROJ_SRC}" -B "${PKG_BULD_DIR}" \
   -D CMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON \
   -D CMAKE_INSTALL_PREFIX="${PKG_INST_DIR}" \
   -D CMAKE_INSTALL_LIBDIR:PATH=lib \
-  ${PKG_BULD_TYPE} ${PKG_TYPE_FLAG} ${CMAKE_EXTRA_ARGS} \
+  ${PKG_BULD_TYPE} ${PKG_TYPE_FLAG} ${CMAKE_EXTRA} \
   -D SDL_CCACHE:BOOL=0 -D SDL_TEST:BOOL=0 \
   -D SDL2_DISABLE_SDL2MAIN:BOOL=1
 EOF
@@ -48,11 +48,3 @@ printf "\e[1m\e[36m%s\e[0m\n" "${CMAKE_COMMAND}"; eval ${CMAKE_COMMAND}
 # build & install
 cmake --build "${PKG_BULD_DIR}" -j ${PARALLEL_JOBS}
 cmake --install "${PKG_BULD_DIR}" ${PKG_INST_STRIP}
-
-if command -v tree >/dev/null 2>&1 ; then
-  tree -L 3 ${PKG_INST_DIR}
-else
-  ls -alh -- ${PKG_INST_DIR}
-fi
-BUILD_DATE=$(date -u '+%Y-%m-%dT%H:%M:%SZ%:z')
-printf "\e[1m\e[35m%s\e[0m\n" "${SUBPROJ_SRC} - Build Done @${BUILD_DATE}"