- commit
- 7920c5d214344f859e0cd5987433a3b303eb85f3
- parent
- 60faddef5b3171ef955e9170a8c143c2dc87ba4f
- author
- FelineStateMachine <dami.etoile@gmail.com>
| M | scripts/ | 10 | +++++++--- |
| M | scripts/ | 2 | ++ |
| M | scripts/ | 8 | ++++++-- |
@@ -194,9 +194,13 @@ else
194194 git -C "$repo_dir" archive --format=tar "$git_commit" | tar -xf - -C "$build_source"195195 (196196 cd "$build_source"197- PKG_CONFIG_ALLOW_CROSS=1 CARGO_TARGET_DIR="$build_target" \198- cargo zigbuild --locked -p sigil-host --bins \199- --target "$linux_target" --release --features in-process-gstreamer197+ # Zig uses no host system-library fallback for explicit targets. Ask the198+ # GStreamer build scripts to retain pkg-config's native -L directories;199+ # these are link-time paths only and do not add an rpath to the binaries.200+ PKG_CONFIG_ALLOW_CROSS=1 PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 \201+ CARGO_TARGET_DIR="$build_target" \202+ cargo zigbuild --locked -p sigil-host --bins \203+ --target "$linux_target" --release --features in-process-gstreamer200204 )201205 host_binary="$build_target/$linux_output_target/release/sigil"202206 probe_binary="$build_target/$linux_output_target/release/sigil-probe"@@ -41,6 +41,8 @@ printf '%s\n' \
4141 '#!/usr/bin/env bash' \4242 'set -euo pipefail' \4343 'test "${1:-}" = zigbuild' \44+ 'test "${PKG_CONFIG_ALLOW_CROSS:-}" = 1' \45+ 'test "${PKG_CONFIG_ALLOW_SYSTEM_LIBS:-}" = 1' \4446 'case " $* " in *" --features in-process-gstreamer "*) ;; *) exit 64 ;; esac' \4547 'output="$CARGO_TARGET_DIR/x86_64-unknown-linux-gnu/release"' \4648 'install -d -m 0700 "$output"' \@@ -74,8 +74,12 @@ if [[ "${GOQ_VERIFY_IN_PROCESS_GSTREAMER:-0}" == 1 ]]; then
7474 fi7575 if command -v cargo-zigbuild >/dev/null 2>&1 && command -v zig >/dev/null 2>&1; then7676 if [[ "${GOQ_VERIFY_IN_PROCESS_GSTREAMER:-0}" == 1 ]]; then77- PKG_CONFIG_ALLOW_CROSS=1 cargo zigbuild --locked -p sigil-host --bins \78- --target x86_64-unknown-linux-gnu.2.17 --features in-process-gstreamer77+ # Zig intentionally omits the host's default system-library paths for an78+ # explicit target. Preserve pkg-config's system -L entries so the dynamic79+ # GStreamer/GLib development libraries remain linkable without an rpath.80+ PKG_CONFIG_ALLOW_CROSS=1 PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 \81+ cargo zigbuild --locked -p sigil-host --bins \82+ --target x86_64-unknown-linux-gnu.2.17 --features in-process-gstreamer7983 else8084 cargo zigbuild --locked -p sigil-host --bins \8185 --target x86_64-unknown-linux-gnu.2.17