From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) by mail.openembedded.org (Postfix) with ESMTP id D44BE7FD05 for ; Mon, 20 Jan 2020 17:25:45 +0000 (UTC) Received: by mail-wr1-f48.google.com with SMTP id g17so324376wro.2 for ; Mon, 20 Jan 2020 09:25:47 -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=eHksu2T+wtPyCZUvlUwKJoi0aBwnvoszipP/2lGFMms=; b=bJuZGzRaGdf/9cb7E/AzXDtqFmqiNFSol99XSWIpz2xn7yMVGjNI8aK14a/Hv90/3x zxKtZAfY3sOmFHmjPxWQOhmT78qVYBk8MBFnjFYM/HtBg3LVW+rDHVgD3JE4BI8v4Yku 1iepzQdXe0wRBGfBqbZqSYvnPxBIvJkXJxOXXX6O+uAj824beR8RRjArG6ghknUGqS6u H/eWLzihSqJuxPWVeCASCv9ZTXAoxTw9ywGJLxziGLdtC44VnFzy65jobL62XwnxTACe IHDZQMDjaLsKBccLknI8PRZaKJGZlmj/p8981MzfB9TCI1ExCcnT8BmVlqC6chu1BJ0B CdLA== 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=eHksu2T+wtPyCZUvlUwKJoi0aBwnvoszipP/2lGFMms=; b=HBsT25T0fLEr21n9kwvEa8ymW0yDjZM/pZBHZqouukZuthbCNGI/7UdMnG/BT5T2pd UOy9UV1cbZBFF2z8PSndfPZ8jzI1XVxNqj00SefrZzU4aPQcrMNZj2QrzgXaRICG1b3C j/5IjzDFB/R1j5tvnrlTASoCBHbcTpWlV9uEODKS32NQu5pRt8ns9KiFSAO+ds7VEH4b tLNaochZCvNVDd2HoJNoIEdIqzeMBmdPgnfEQ1dx+C100cwhXTVwCKk4+eqpag8VOxk4 oriQ2tSMkr2A6jPSjJZepewc0CNZfOvjZ3FMTqgwTds9Wp6hgIhm0oAZqrFPHg9CarRg tASw== X-Gm-Message-State: APjAAAVUxtdpyJ1DmpHj7ULyMBela2d5+YlT3QlRd0rhh4Owq4+dzcGS 52NG7c+Dqsyw5/kMjgMYj3SHSLgA X-Google-Smtp-Source: APXvYqypDdOjW4wSKv3Oaj4NbyMNlenwYdaK7EPamDHR+I9dybwj+B/zuCitMBCrnlBGBDD3tt6kwg== X-Received: by 2002:adf:ef4e:: with SMTP id c14mr590352wrp.142.1579541146051; Mon, 20 Jan 2020 09:25:46 -0800 (PST) Received: from alexander-box.rd.corpintra.net ([141.113.66.202]) by smtp.gmail.com with ESMTPSA id x11sm31526wmg.46.2020.01.20.09.25.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Jan 2020 09:25:45 -0800 (PST) From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Date: Mon, 20 Jan 2020 18:25:10 +0100 Message-Id: <20200120172510.22648-24-alex.kanavin@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200120172510.22648-1-alex.kanavin@gmail.com> References: <20200120172510.22648-1-alex.kanavin@gmail.com> Subject: [PATCH 24/24] meson: update 0.52.1 -> 0.53.0 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, 20 Jan 2020 17:25:46 -0000 Signed-off-by: Alexander Kanavin --- meta/classes/meson.bbclass | 9 ++++++++- meta/recipes-devtools/meson/meson.inc | 4 ++-- .../0001-Make-CPU-family-warnings-fatal.patch | 12 ++++++------ ...-do-not-manipulate-the-environment-when.patch | 16 ++++++++-------- ...-Support-building-allarch-recipes-again.patch | 6 +++--- .../meson/meson/0003-native_bindir.patch | 16 ++++++++-------- .../meson/{meson_0.52.1.bb => meson_0.53.0.bb} | 0 ...meson_0.52.1.bb => nativesdk-meson_0.53.0.bb} | 0 8 files changed, 35 insertions(+), 28 deletions(-) rename meta/recipes-devtools/meson/{meson_0.52.1.bb => meson_0.53.0.bb} (100%) rename meta/recipes-devtools/meson/{nativesdk-meson_0.52.1.bb => nativesdk-meson_0.53.0.bb} (100%) diff --git a/meta/classes/meson.bbclass b/meta/classes/meson.bbclass index 1ef34a999c8..1837c9468e6 100644 --- a/meta/classes/meson.bbclass +++ b/meta/classes/meson.bbclass @@ -85,13 +85,16 @@ addtask write_config before do_configure do_write_config[vardeps] += "CC CXX LD AR NM STRIP READELF CFLAGS CXXFLAGS LDFLAGS" do_write_config() { # This needs to be Py to split the args into single-element lists + + # Meson requires ld to be 'bfd, 'lld' or 'gold' from 0.53 onwards + # https://github.com/mesonbuild/meson/commit/ef9aeb188ea2bc7353e59916c18901cde90fa2b3 cat >${WORKDIR}/meson.cross < Date: Thu, 26 Jul 2018 16:32:49 +0200 Subject: [PATCH] Support building allarch recipes again @@ -13,7 +13,7 @@ Signed-off-by: Peter Kjellerstedt 1 file changed, 1 insertion(+) diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py -index 5fb00a4..f5702ba 100644 +index 24578ea..216e71f 100644 --- a/mesonbuild/envconfig.py +++ b/mesonbuild/envconfig.py @@ -36,6 +36,7 @@ _T = typing.TypeVar('_T') @@ -22,5 +22,5 @@ index 5fb00a4..f5702ba 100644 known_cpu_families = ( + 'allarch', 'aarch64', + 'alpha', 'arc', - 'arm', diff --git a/meta/recipes-devtools/meson/meson/0003-native_bindir.patch b/meta/recipes-devtools/meson/meson/0003-native_bindir.patch index 14a9a136664..76c1aa9ac1c 100644 --- a/meta/recipes-devtools/meson/meson/0003-native_bindir.patch +++ b/meta/recipes-devtools/meson/meson/0003-native_bindir.patch @@ -1,4 +1,4 @@ -From baf7b94fec5a31b2d0cb162e43dbd28cc019f38e Mon Sep 17 00:00:00 2001 +From af2554b9b08af973181b4e4181bd1cb936fdbb8f Mon Sep 17 00:00:00 2001 From: Ricardo Ribalda Delgado Date: Wed, 15 Nov 2017 15:05:01 +0100 Subject: [PATCH] native_bindir @@ -22,7 +22,7 @@ Signed-off-by: Ricardo Ribalda Delgado 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py -index 35f0175..b39cba6 100644 +index f17b9f2..b5c9c92 100644 --- a/mesonbuild/dependencies/base.py +++ b/mesonbuild/dependencies/base.py @@ -184,7 +184,7 @@ class Dependency: @@ -43,7 +43,7 @@ index 35f0175..b39cba6 100644 raise DependencyException('Method "get_pkgconfig_variable()" is ' 'invalid for an internal dependency') -@@ -670,15 +670,18 @@ class PkgConfigDependency(ExternalDependency): +@@ -673,15 +673,18 @@ class PkgConfigDependency(ExternalDependency): return s.format(self.__class__.__name__, self.name, self.is_found, self.version_reqs) @@ -65,7 +65,7 @@ index 35f0175..b39cba6 100644 # Always copy the environment since we're going to modify it # with pkg-config variables if env is None: -@@ -698,7 +701,7 @@ class PkgConfigDependency(ExternalDependency): +@@ -701,7 +704,7 @@ class PkgConfigDependency(ExternalDependency): targs = tuple(args) cache = PkgConfigDependency.pkgbin_cache if (self.pkgbin, targs, fenv) not in cache: @@ -73,8 +73,8 @@ index 35f0175..b39cba6 100644 + cache[(self.pkgbin, targs, fenv)] = self._call_pkgbin_real(args, env, use_native) return cache[(self.pkgbin, targs, fenv)] - def _convert_mingw_paths(self, args): -@@ -885,7 +888,7 @@ class PkgConfigDependency(ExternalDependency): + def _convert_mingw_paths(self, args: List[str]) -> List[str]: +@@ -907,7 +910,7 @@ class PkgConfigDependency(ExternalDependency): (self.name, out_raw)) self.link_args, self.raw_link_args = self._search_libs(out, out_raw) @@ -83,7 +83,7 @@ index 35f0175..b39cba6 100644 options = ['--variable=' + variable_name, self.name] if 'define_variable' in kwargs: -@@ -898,7 +901,7 @@ class PkgConfigDependency(ExternalDependency): +@@ -920,7 +923,7 @@ class PkgConfigDependency(ExternalDependency): options = ['--define-variable=' + '='.join(definition)] + options @@ -93,7 +93,7 @@ index 35f0175..b39cba6 100644 if ret != 0: if self.required: diff --git a/mesonbuild/dependencies/ui.py b/mesonbuild/dependencies/ui.py -index 6d784e6..73a9e13 100644 +index bdcc4a7..e2de847 100644 --- a/mesonbuild/dependencies/ui.py +++ b/mesonbuild/dependencies/ui.py @@ -330,7 +330,7 @@ class QtBaseDependency(ExternalDependency): diff --git a/meta/recipes-devtools/meson/meson_0.52.1.bb b/meta/recipes-devtools/meson/meson_0.53.0.bb similarity index 100% rename from meta/recipes-devtools/meson/meson_0.52.1.bb rename to meta/recipes-devtools/meson/meson_0.53.0.bb diff --git a/meta/recipes-devtools/meson/nativesdk-meson_0.52.1.bb b/meta/recipes-devtools/meson/nativesdk-meson_0.53.0.bb similarity index 100% rename from meta/recipes-devtools/meson/nativesdk-meson_0.52.1.bb rename to meta/recipes-devtools/meson/nativesdk-meson_0.53.0.bb -- 2.17.1