OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ci: CI should handle also arrays in meson cross-file

Browse Source 
The new meson env2mfile generates everything in the arrays.

Signed-off-by: David Heidelberg <david.heidelberg@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19863>
This commit is contained in:
David Heidelberg
2022-11-26 21:29:38 +01:00
committed by Marge Bot
parent 43eab9252e
commit 4ada7f0239
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.gitlab-ci/container/create-cross-file.sh
View File

@@ -13,8 +13,9 @@ fi
# shellcheck disable=SC1003 # how this sed doesn't seems to work for me locally # shellcheck disable=SC1003 # how this sed doesn't seems to work for me locally
sed -i -e '/\[properties\]/a\' -e "needs_exe_wrapper = False" "$cross_file" sed -i -e '/\[properties\]/a\' -e "needs_exe_wrapper = False" "$cross_file"
# Add a line for rustc, which debcrossgen is missing. # Add a line for rustc, which meson env2mfile is missing.
cc=$(sed -n 's|c = .\(.*\).|\1|p' < "$cross_file") cc=$(sed -n "s|^c\s*=\s*\[?'\(.*\)'\]?|\1|p" < "$cross_file")
if [[ "$arch" = "arm64" ]]; then if [[ "$arch" = "arm64" ]]; then
rust_target=aarch64-unknown-linux-gnu rust_target=aarch64-unknown-linux-gnu
elif [[ "$arch" = "armhf" ]]; then elif [[ "$arch" = "armhf" ]]; then

2
.gitlab-ci/prepare-artifacts.sh
View File

@@ -10,7 +10,7 @@ rm -rf install/bin install/include
# Strip the drivers in the artifacts to cut 80% of the artifacts size. # Strip the drivers in the artifacts to cut 80% of the artifacts size.
if [ -n "$CROSS" ]; then if [ -n "$CROSS" ]; then
STRIP=`sed -n -E "s/strip\s*=\s*'(.*)'/\1/p" "$CROSS_FILE"` STRIP=$(sed -n -E "s/strip\s*=\s*\[?'(.*)'\]?/\1/p" "$CROSS_FILE")
if [ -z "$STRIP" ]; then if [ -z "$STRIP" ]; then
echo "Failed to find strip command in cross file" echo "Failed to find strip command in cross file"
exit 1 exit 1