From 176b858e013e2a1bf1c2b4303c6a21753c811660 Mon Sep 17 00:00:00 2001 From: Esben Haabendal <esben.haabendal@huawei.com> Date: Thu, 14 Jul 2022 17:28:45 +0200 Subject: [PATCH] prebuilts: Fix support for multiple --ninja-args arguments Signed-off-by: Esben Haabendal <esben.haabendal@huawei.com> --- ...-openharmony-toolchain-integration-3.0.inc | 3 +-- .../patches/build-ninja_args.patch | 25 +++++++++++++++++++ 2 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 recipes-openharmony/prebuilts/openharmony-3.0/patches/build-ninja_args.patch diff --git a/recipes-openharmony/prebuilts/oniro-openharmony-toolchain-integration-3.0.inc b/recipes-openharmony/prebuilts/oniro-openharmony-toolchain-integration-3.0.inc index 6eb7a6ae..40877db8 100644 --- a/recipes-openharmony/prebuilts/oniro-openharmony-toolchain-integration-3.0.inc +++ b/recipes-openharmony/prebuilts/oniro-openharmony-toolchain-integration-3.0.inc @@ -2,5 +2,4 @@ # # SPDX-License-Identifier: Apache-2.0 -# This file is intentionally left empty. -# It is needed so the 'require' statement in oniro-openharmony-toolchain-integration.bb doesn't fail +SRC_URI += "file://patches/build-ninja_args.patch;apply=no;subdir=src" diff --git a/recipes-openharmony/prebuilts/openharmony-3.0/patches/build-ninja_args.patch b/recipes-openharmony/prebuilts/openharmony-3.0/patches/build-ninja_args.patch new file mode 100644 index 00000000..e263b2fa --- /dev/null +++ b/recipes-openharmony/prebuilts/openharmony-3.0/patches/build-ninja_args.patch @@ -0,0 +1,25 @@ +# SPDX-FileCopyrightText: Huawei Inc. +# +# SPDX-License-Identifier: Apache-2.0 + +Patch for //build git repository of OpenHarmony 3.0 codebase. + +This fixes support for using --ninja-args argument multiple times with build.sh +script. + +Signed-off-by: Esben Haabendal <esben.haabendal@huawei.com> +Upstream-Status: Pending + +diff --git a/build/core/build_scripts/parse_cmdline.sh b/build/core/build_scripts/parse_cmdline.sh +index d8e351ede111..b7a49a2d04ca 100755 +--- a/build/core/build_scripts/parse_cmdline.sh ++++ b/build/core/build_scripts/parse_cmdline.sh +@@ -33,7 +33,7 @@ parse_cmdline() + variant) BUILD_VARIANT="$PARAM" ;; + out_dir) OUT_DIR="$PARAM" ;; + gn_args) GN_ARGS="$GN_ARGS $PARAM" ;; +- ninja_args) NINJA_ARGS="$PARAM" ;; ++ ninja_args) NINJA_ARGS="$NINJA_ARGS $PARAM" ;; + versionmode) TARGET_VERSION_MODE="$PARAM" ;; + coverage) COVERAGE="$PARAM" ;; + custom_clang) CUSTOM_CLANG="$PARAM" ;; -- GitLab