From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on atuin.qyliss.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 Received: by atuin.qyliss.net (Postfix, from userid 496) id 568A31ABCE; Fri, 2 Apr 2021 09:04:41 +0000 (UTC) Received: from [127.0.0.1] (localhost [IPv6:::1]) by atuin.qyliss.net (Postfix) with ESMTP id 57E7A1A9EB; Fri, 2 Apr 2021 09:04:26 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 496) id A24FC1A9C7; Fri, 2 Apr 2021 09:04:23 +0000 (UTC) Received: from a48-104.smtp-out.amazonses.com (a48-104.smtp-out.amazonses.com [54.240.48.104]) by atuin.qyliss.net (Postfix) with ESMTPS id 5D48F1A9C1 for ; Fri, 2 Apr 2021 09:04:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=ug7nbtf4gccmlpwj322ax3p6ow6yfsug; d=amazonses.com; t=1617354256; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References:MIME-Version:Content-Transfer-Encoding:Feedback-ID; bh=uTXsOKcCAlefNye09eyTlt9KnZA+zbze8mFD4nnzRUI=; b=ehyjexPNoNjJmo0X5V+yiSHFgHjllF5v/mCvkPjL206WOth99xpyNTRlINjGZiFo 6GuaIMvtPSvlrMLm9ArrmIlKRisZG/33BEph1znRsIM0/3pIezTL4E0MBspHv30ZT8r 8L4A5miHcVwLMtQuw8xqNnsxHuCPSfcIgklbZ3n0= From: Jamie McClymont To: devel@spectrum-os.org Subject: [RFC PATCH 4/8] chromiumOSPackages.common-mk: update patches Date: Fri, 2 Apr 2021 09:04:16 +0000 Message-ID: <0100017891d36ffd-237e431a-f02c-447a-8774-88da55233ab3-000000@email.amazonses.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210402090042.2020627-1-jamie@kwiius.com> References: <20210402090042.2020627-1-jamie@kwiius.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SES-Outgoing: 2021.04.02-54.240.48.104 Feedback-ID: 1.us-east-1.9pXRggpcNqPasnyFcFNFQXAg6PTGO6hwgAZOzryQyDc=:AmazonSES Message-ID-Hash: 5GZ6Q7GPDI2QOGEICND3LTADKKZ5YOUW X-Message-ID-Hash: 5GZ6Q7GPDI2QOGEICND3LTADKKZ5YOUW X-MailFrom: 0100017891d36ffd-237e431a-f02c-447a-8774-88da55233ab3-000000@amazonses.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header CC: Jamie McClymont X-Mailman-Version: 3.3.1 Precedence: list List-Id: Patches and low-level development discussion Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: --- ...ommon-mk-don-t-leak-source-absolute-paths.patch | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/os-specific/linux/chromium-os/common-mk/0001-common-mk-don-t-leak-source-absolute-paths.patch b/pkgs/os-specific/linux/chromium-os/common-mk/0001-common-mk-don-t-leak-source-absolute-paths.patch index 4b7a2f34779..244ba8f7521 100644 --- a/pkgs/os-specific/linux/chromium-os/common-mk/0001-common-mk-don-t-leak-source-absolute-paths.patch +++ b/pkgs/os-specific/linux/chromium-os/common-mk/0001-common-mk-don-t-leak-source-absolute-paths.patch @@ -38,13 +38,11 @@ diff --git a/common-mk/pkg_config.gni b/common-mk/pkg_config.gni index af3c3fb4c..151c49e56 100644 --- a/common-mk/pkg_config.gni +++ b/common-mk/pkg_config.gni -@@ -81,12 +81,11 @@ template("generate_pkg_config") { +@@ -81,10 +81,11 @@ template("generate_pkg_config") { if (!defined(output_name)) { output_name = name } -- outputs = [ -- "${target_out_dir}/${output_name}.pc", -- ] +- outputs = [ "${target_out_dir}/${output_name}.pc" ] + lib_path = "${target_out_dir}/${output_name}.pc" + outputs = [ lib_path ] @@ -117,11 +115,11 @@ index 7fcb08341..692704288 100644 # Build protoc command line to run. script = "//common-mk/file_generator_wrapper.py" @@ -224,7 +225,7 @@ template("goproto_library") { - "--proto_path", - "${sysroot}/usr/share/proto", + args += [ "--go_out", -- "${go_out_prefix}${root_gen_dir}/${proto_out_dir}", -+ "${go_out_prefix}${proto_out_dir}", + # go_out_prefix can be empty, so we can always add a colon here. +- "${go_out_prefix}:${root_gen_dir}/${proto_out_dir}", ++ "${go_out_prefix}:${proto_out_dir}", ] foreach(source, sources) { args += [ rebase_path(source) ] -- 2.31.1