From: Jamie McClymont <jamie@kwiius.com>
To: devel@spectrum-os.org
Cc: Jamie McClymont <jamie@kwiius.com>
Subject: [RFC PATCH 4/8] chromiumOSPackages.common-mk: update patches
Date: Fri, 2 Apr 2021 09:04:16 +0000 [thread overview]
Message-ID: <0100017891d36ffd-237e431a-f02c-447a-8774-88da55233ab3-000000@email.amazonses.com> (raw)
In-Reply-To: <20210402090042.2020627-1-jamie@kwiius.com>
---
...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
next prev parent reply other threads:[~2021-04-02 9:04 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20210402090042.2020627-1-jamie@kwiius.com>
2021-04-02 9:04 ` [RFC PATCH 3/8] chromiumOSPackages.vm_protos: drop GN patch Jamie McClymont
2021-04-02 15:53 ` Alyssa Ross
2021-04-02 9:04 ` Jamie McClymont [this message]
2021-04-02 15:47 ` [RFC PATCH 4/8] chromiumOSPackages.common-mk: update patches Alyssa Ross
2021-04-02 9:04 ` [RFC PATCH 1/8] chromiumOSPackages: update 83->89 Jamie McClymont
2021-04-02 14:58 ` Alyssa Ross
2021-04-02 9:04 ` [RFC PATCH 2/8] chromiumOSPackages.cros_linux: fix config Jamie McClymont
2021-04-02 15:35 ` Alyssa Ross
2021-04-02 9:04 ` [RFC PATCH 5/8] chromiumOSPackages.common-mk: disable clang-only warnings Jamie McClymont
2021-04-02 15:54 ` Alyssa Ross
2021-04-02 9:04 ` [RFC PATCH 6/8] chromiumOSPackages.sommelier: drop unneeded patches Jamie McClymont
2021-04-02 16:11 ` Alyssa Ross
2021-04-02 17:28 ` Alyssa Ross
2021-04-02 17:18 ` Thomas Leonard
2021-04-02 21:00 ` [PATCH platform2] Revert "Revert "vm_tools: sommelier: Switch to the stable version of xdg-shell"" Alyssa Ross
2021-04-02 9:04 ` [RFC PATCH 8/8] chromiumOSPackages.crosvm: bump cargoSha256 Jamie McClymont
2021-04-02 9:04 ` [RFC PATCH 7/8] chromiumOSPackages.crosvm: add platform2 dep Jamie McClymont
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=0100017891d36ffd-237e431a-f02c-447a-8774-88da55233ab3-000000@email.amazonses.com \
--to=jamie@kwiius.com \
--cc=devel@spectrum-os.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://spectrum-os.org/git/crosvm
https://spectrum-os.org/git/doc
https://spectrum-os.org/git/mktuntap
https://spectrum-os.org/git/nixpkgs
https://spectrum-os.org/git/spectrum
https://spectrum-os.org/git/ucspi-vsock
https://spectrum-os.org/git/www
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).