mirror of
https://gitlab.freedesktop.org/mesa/mesa.git
synced 2024-11-30 13:44:06 +08:00
09fb55ea92
When running .gitlab-ci/container/debian/android_build.sh using the cross files created by .gitlab-ci/container/create-android-cross-file.sh meson prints out the following warning: ----------------------------------------------------------------------- DEPRECATION: "pkgconfig" entry is deprecated and should be replaced by "pkg-config" ----------------------------------------------------------------------- Use the suggested name `pkg-config` in the cross files to silence the warning. Apply the same change also to the example meson cross file in docs/android.rst Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29431>
38 lines
1.2 KiB
Bash
38 lines
1.2 KiB
Bash
#!/bin/bash
|
|
|
|
ndk=$1
|
|
arch=$2
|
|
cpu_family=$3
|
|
cpu=$4
|
|
cross_file="/cross_file-$arch.txt"
|
|
sdk_version=$5
|
|
|
|
# armv7 has the toolchain split between two names.
|
|
arch2=${6:-$2}
|
|
|
|
# Note that we disable C++ exceptions, because Mesa doesn't use exceptions,
|
|
# and allowing it in code generation means we get unwind symbols that break
|
|
# the libEGL and driver symbol tests.
|
|
|
|
cat > "$cross_file" <<EOF
|
|
[binaries]
|
|
ar = '$ndk/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ar'
|
|
c = ['ccache', '$ndk/toolchains/llvm/prebuilt/linux-x86_64/bin/${arch2}${sdk_version}-clang', '-fno-exceptions', '-fno-unwind-tables', '-fno-asynchronous-unwind-tables']
|
|
cpp = ['ccache', '$ndk/toolchains/llvm/prebuilt/linux-x86_64/bin/${arch2}${sdk_version}-clang++', '-fno-exceptions', '-fno-unwind-tables', '-fno-asynchronous-unwind-tables', '-static-libstdc++']
|
|
c_ld = 'lld'
|
|
cpp_ld = 'lld'
|
|
strip = '$ndk/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip'
|
|
pkg-config = ['/usr/bin/pkgconf']
|
|
|
|
[host_machine]
|
|
system = 'android'
|
|
cpu_family = '$cpu_family'
|
|
cpu = '$cpu'
|
|
endian = 'little'
|
|
|
|
[properties]
|
|
needs_exe_wrapper = true
|
|
pkg_config_libdir = '/usr/local/lib/${arch2}/pkgconfig/:/${ndk}/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/${arch2}/pkgconfig/'
|
|
|
|
EOF
|