From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-lj1-f171.google.com (mail-lj1-f171.google.com [209.85.208.171]) by mail.openembedded.org (Postfix) with ESMTP id 307B37C85D for ; Mon, 18 Feb 2019 12:41:15 +0000 (UTC) Received: by mail-lj1-f171.google.com with SMTP id q128so14176577ljb.11 for ; Mon, 18 Feb 2019 04:41:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=9QIWOxJQ2ZjwuptQL8AXpa88vpF8jlk5mJj1VIS0Nj8=; b=ucyDVpgfpIfagvbRyHs+HHsGZSvqAcjEjDshWHe5AO14fBKFSSZ94T87wtuJUnAIFO mhyr076HjquqN0fe+M4Qh+kA4ZpowoKJIWOGoohJYNI8ajOGCE3hdfk9yL4lnPLlI8El WsOjz+7AfBVLScWdy064OIX4mo4pqHFFyfpj2DQuW4BQqK4wbExfDeiiWsyzfdpgb0mq rSXJ4BFRWiQ7mA2I6L6e8KwUTKz0oo5Vvl2YuuiXESdh6Bl51CthyvsyBXzCp6GslR9J pMRafPa6bXHyBqandb2lflMR9NpdHJiQg0R4r+orVs4AwU5JGVHCfy/QG3sK2nnibyFv RPyg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=9QIWOxJQ2ZjwuptQL8AXpa88vpF8jlk5mJj1VIS0Nj8=; b=ZRiiu86zQezXI8WmP1eC7+dlB4GJa6z2N26hDK9DI2XPKku95CRD0rzLhOGFdrNER0 Ws2Ek0GdPotcuOrjIo3ToqvSStwRCFankJE+e8SVaDQBAjRJh/RpkoOTt+mNxZKFN4Qz 5+CeKgjal/tE6/IU61cufVuUYa7KB8dHyj6fkTz+LDLLQ4JS/FyF//QQafDiKYTeohjg Pjt7VrTg3F4ykEEM1ZpZ7WKVxir3081Sx8RhSaBaiH+Ca7gr8NUca+mdBLhW/yn05ncE WmOSpxdrT/0Xxce1crKSbIWWh1GHbUFao+6gcEjWuUS/pQqXN48Zt8fYrxILhoFIkdux aCOQ== X-Gm-Message-State: AHQUAuYX3PlLMfz/Xv8RcCTI/nns56D4Qq/pFh1JWvK2bA8fJx7djl9P mUuAeUbfbIYN9FaJOl/uWnlwt+wx X-Google-Smtp-Source: AHgI3IaDy6m1e6V5EFaLa7EyGWD4X/FSCitoNU/+DKXAvVPDIJ2zQbunrQmi6Q8UT9Ct/OFIBTxroA== X-Received: by 2002:a2e:2202:: with SMTP id i2mr9798676lji.170.1550493676246; Mon, 18 Feb 2019 04:41:16 -0800 (PST) Received: from alexander-box.luxoft.com ([62.96.135.139]) by smtp.gmail.com with ESMTPSA id h3sm3733898lfj.25.2019.02.18.04.41.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 Feb 2019 04:41:15 -0800 (PST) From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Date: Mon, 18 Feb 2019 13:41:02 +0100 Message-Id: <20190218124108.7846-2-alex.kanavin@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190218124108.7846-1-alex.kanavin@gmail.com> References: <20190218124108.7846-1-alex.kanavin@gmail.com> Subject: [PATCH 2/8] meson: add a couple of patches to help with mingw builds X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Feb 2019 12:41:16 -0000 Signed-off-by: Alexander Kanavin --- meta/recipes-devtools/meson/meson.inc | 2 ++ ...s-windows-split-WINDRES-env-variable.patch | 26 +++++++++++++++++++ ...etect-windows-also-if-the-system-str.patch | 25 ++++++++++++++++++ 3 files changed, 53 insertions(+) create mode 100644 meta/recipes-devtools/meson/meson/0001-modules-windows-split-WINDRES-env-variable.patch create mode 100644 meta/recipes-devtools/meson/meson/0002-environment.py-detect-windows-also-if-the-system-str.patch diff --git a/meta/recipes-devtools/meson/meson.inc b/meta/recipes-devtools/meson/meson.inc index d37afc3b0dc..c39b1a3d5e2 100644 --- a/meta/recipes-devtools/meson/meson.inc +++ b/meta/recipes-devtools/meson/meson.inc @@ -12,6 +12,8 @@ SRC_URI = "https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${P file://0001-python-module-do-not-manipulate-the-environment-when.patch \ file://disable-rpath-handling.patch \ file://cross-libdir.patch \ + file://0001-modules-windows-split-WINDRES-env-variable.patch \ + file://0002-environment.py-detect-windows-also-if-the-system-str.patch \ " SRC_URI[sha256sum] = "fb0395c4ac208eab381cd1a20571584bdbba176eb562a7efa9cb17cace0e1551" SRC_URI[md5sum] = "3c35b91e8040901034809576d54007c6" diff --git a/meta/recipes-devtools/meson/meson/0001-modules-windows-split-WINDRES-env-variable.patch b/meta/recipes-devtools/meson/meson/0001-modules-windows-split-WINDRES-env-variable.patch new file mode 100644 index 00000000000..c334e6dd66b --- /dev/null +++ b/meta/recipes-devtools/meson/meson/0001-modules-windows-split-WINDRES-env-variable.patch @@ -0,0 +1,26 @@ +From 5293d0f5067b2aeefe9ce3c175c972de367589bc Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Wed, 13 Feb 2019 17:43:54 +0100 +Subject: [PATCH] modules/windows: split WINDRES env variable + +As it may contain not just the binary, but also the arguments to it. + +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin +--- + mesonbuild/modules/windows.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/mesonbuild/modules/windows.py b/mesonbuild/modules/windows.py +index d185d89..dbaeb9b 100644 +--- a/mesonbuild/modules/windows.py ++++ b/mesonbuild/modules/windows.py +@@ -56,7 +56,7 @@ class WindowsModule(ExtensionModule): + if 'WINDRES' in os.environ: + # Pick-up env var WINDRES if set. This is often used for + # specifying an arch-specific windres. +- rescomp = ExternalProgram('windres', command=os.environ.get('WINDRES'), silent=True) ++ rescomp = ExternalProgram('windres', command=os.environ.get('WINDRES').split(), silent=True) + + if not rescomp or not rescomp.found(): + # Take windres from the config file after the environment, which is diff --git a/meta/recipes-devtools/meson/meson/0002-environment.py-detect-windows-also-if-the-system-str.patch b/meta/recipes-devtools/meson/meson/0002-environment.py-detect-windows-also-if-the-system-str.patch new file mode 100644 index 00000000000..1be5d663291 --- /dev/null +++ b/meta/recipes-devtools/meson/meson/0002-environment.py-detect-windows-also-if-the-system-str.patch @@ -0,0 +1,25 @@ +From 7bf4c2c02eb7fe1bf24b23e3ba2d7df36495e0aa Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Wed, 13 Feb 2019 17:45:09 +0100 +Subject: [PATCH] environment.py: detect windows also if the system string + contains 'mingw' + +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin +--- + mesonbuild/environment.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py +index b4fc0dc..845077e 100644 +--- a/mesonbuild/environment.py ++++ b/mesonbuild/environment.py +@@ -1247,7 +1247,7 @@ class MachineInfo: + """ + Machine is windows? + """ +- return self.system == 'windows' ++ return self.system == 'windows' or 'mingw' in self.system + + def is_cygwin(self): + """ -- 2.17.1