All of lore.kernel.org
 help / color / mirror / Atom feed
From: Rasmus Villemoes <rasmus.villemoes@prevas.dk>
To: "openembedded-devel@lists.openembedded.org"
	<openembedded-devel@lists.openembedded.org>
Cc: Maksim Sisov <msisov@igalia.com>,
	Rasmus Villemoes <Rasmus.Villemoes@prevas.se>,
	Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>,
	Jakob Dyhr Thomsen <jakob.dyhr@prevas.dk>,
	Jonas Suhr Christensen <Jonas.Christensen@prevas.dk>
Subject: [meta-browser][PATCH 2/2] chromium: add patch to fix build of native tool make_top_domain_list_for_edit_distance
Date: Fri, 9 Aug 2019 09:20:36 +0000	[thread overview]
Message-ID: <20190809092013.32650-2-rasmus.villemoes@prevas.dk> (raw)
In-Reply-To: <20190809092013.32650-1-rasmus.villemoes@prevas.dk>

Inside the source_set("net_deps"), one finds

  if (!is_nacl) {
    public_deps += [
      "//base/third_party/dynamic_annotations",
      "//third_party/zlib",
    ]

and the recipe explicitly sets enable_nacl=false. So one should think
that this was already ok, but without it, the build fails. I don't
really understand the gn config language, but perhaps the above has no
effect because the :net_deps is only pulled into deps.

Signed-off-by: Rasmus Villemoes <rasmus.villemoes@prevas.dk>
---
 recipes-browser/chromium/chromium-gn.inc      |  1 +
 ...-third_party-zlib-to-public-dependen.patch | 29 +++++++++++++++++++
 2 files changed, 30 insertions(+)
 create mode 100644 recipes-browser/chromium/files/net-BUILD.gn-add-third_party-zlib-to-public-dependen.patch

diff --git a/recipes-browser/chromium/chromium-gn.inc b/recipes-browser/chromium/chromium-gn.inc
index d9735ab..2c8cd20 100644
--- a/recipes-browser/chromium/chromium-gn.inc
+++ b/recipes-browser/chromium/chromium-gn.inc
@@ -14,6 +14,7 @@ SRC_URI += " \
         file://wrapper-extra-flags.patch \
         file://do-not-specify-march-on-arm.patch \
         file://add_internal_define_armv7ve.patch \
+        file://net-BUILD.gn-add-third_party-zlib-to-public-dependen.patch \
 "
 
 SRC_URI_append_libc-musl = "\
diff --git a/recipes-browser/chromium/files/net-BUILD.gn-add-third_party-zlib-to-public-dependen.patch b/recipes-browser/chromium/files/net-BUILD.gn-add-third_party-zlib-to-public-dependen.patch
new file mode 100644
index 0000000..bffd65d
--- /dev/null
+++ b/recipes-browser/chromium/files/net-BUILD.gn-add-third_party-zlib-to-public-dependen.patch
@@ -0,0 +1,29 @@
+From 141ffd4e77d1142461cca86065695433acd0914a Mon Sep 17 00:00:00 2001
+From: Rasmus Villemoes <rasmus.villemoes@prevas.dk>
+Date: Wed, 7 Aug 2019 13:02:36 +0200
+Subject: [PATCH] net/BUILD.gn: add third_party/zlib to public dependencies
+
+Without this, the build of yocto_native/make_top_domain_list_for_edit_distance fails
+(libchrome_zlib.so, needed by yocto_native/libnet.so, not found).
+
+Upstream-Status: pending
+
+---
+ net/BUILD.gn | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/net/BUILD.gn b/net/BUILD.gn
+index b3d97f6a0a67..d4f1800c74d4 100644
+--- a/net/BUILD.gn
++++ b/net/BUILD.gn
+@@ -2337,6 +2337,7 @@ source_set("net_public_deps") {
+     "//crypto:platform",
+     "//net/traffic_annotation",
+     "//third_party/boringssl",
++    "//third_party/zlib",
+     "//url",
+   ]
+ 
+-- 
+2.20.1
+
-- 
2.20.1



  reply	other threads:[~2019-08-09  9:20 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-08-09  9:20 [meta-browser][PATCH 1/2] chromium: don't pass is_official_build=true when doing a component-build Rasmus Villemoes
2019-08-09  9:20 ` Rasmus Villemoes [this message]
2019-08-09 15:20 ` Khem Raj
2019-08-09 19:36 ` Otavio Salvador

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=20190809092013.32650-2-rasmus.villemoes@prevas.dk \
    --to=rasmus.villemoes@prevas.dk \
    --cc=Jonas.Christensen@prevas.dk \
    --cc=Rasmus.Villemoes@prevas.se \
    --cc=jakob.dyhr@prevas.dk \
    --cc=msisov@igalia.com \
    --cc=openembedded-devel@lists.openembedded.org \
    --cc=raphael.kubo.da.costa@intel.com \
    /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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.