From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from dude02.hi.pengutronix.de ([2001:67c:670:100:1d::28] helo=dude02.pengutronix.de.) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1hxYqa-0005EM-R0 for ptxdist@pengutronix.de; Tue, 13 Aug 2019 17:36:28 +0200 From: Lucas Stach Date: Tue, 13 Aug 2019 17:36:28 +0200 Message-Id: <20190813153628.31017-1-l.stach@pengutronix.de> MIME-Version: 1.0 Subject: [ptxdist] [PATCH] host-meson: version bump 0.49.2 -> 0.51.1 List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ptxdist-bounces@pengutronix.de Sender: "ptxdist" To: ptxdist@pengutronix.de Signed-off-by: Lucas Stach --- ...-t-close-fds-when-executing-programs.patch | 23 ------------------- ...or-shared-libaries-in-get_link_dep_s.patch | 4 ++-- ...-for-build-directories-when-cross-co.patch | 10 ++++---- ...-t-loose-the-rpath-for-host-packages.patch | 10 ++++---- patches/{meson-0.49.2 => meson-0.51.1}/series | 3 +-- rules/host-meson.make | 4 ++-- 6 files changed, 15 insertions(+), 39 deletions(-) delete mode 100644 patches/meson-0.49.2/0004-Don-t-close-fds-when-executing-programs.patch rename patches/{meson-0.49.2 => meson-0.51.1}/0001-only-use-paths-for-shared-libaries-in-get_link_dep_s.patch (90%) rename patches/{meson-0.49.2 => meson-0.51.1}/0002-don-t-add-rpaths-for-build-directories-when-cross-co.patch (85%) rename patches/{meson-0.49.2 => meson-0.51.1}/0003-HACK-don-t-loose-the-rpath-for-host-packages.patch (89%) rename patches/{meson-0.49.2 => meson-0.51.1}/series (68%) diff --git a/patches/meson-0.49.2/0004-Don-t-close-fds-when-executing-programs.patch b/patches/meson-0.49.2/0004-Don-t-close-fds-when-executing-programs.patch deleted file mode 100644 index 9c5b51f6a143..000000000000 --- a/patches/meson-0.49.2/0004-Don-t-close-fds-when-executing-programs.patch +++ /dev/null @@ -1,23 +0,0 @@ -From: Michael Olbrich -Date: Mon, 29 Apr 2019 11:28:45 +0200 -Subject: [PATCH] Don't close fds when executing programs - -This is basically the same as ca894a24fca452e5aa982e1fc5dc63117c3e3d71 just -for new new Popen_safe_legacy(). ---- - mesonbuild/mesonlib.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/mesonbuild/mesonlib.py b/mesonbuild/mesonlib.py -index 98c2366d6a48..b5df8473ee40 100644 ---- a/mesonbuild/mesonlib.py -+++ b/mesonbuild/mesonlib.py -@@ -917,7 +917,7 @@ def Popen_safe(args, write=None, stdout=subprocess.PIPE, stderr=subprocess.PIPE, - return p, o, e - - def Popen_safe_legacy(args, write=None, stdout=subprocess.PIPE, stderr=subprocess.PIPE, **kwargs): -- p = subprocess.Popen(args, universal_newlines=False, -+ p = subprocess.Popen(args, universal_newlines=False, close_fds=False, - stdout=stdout, stderr=stderr, **kwargs) - if write is not None: - write = write.encode('utf-8') diff --git a/patches/meson-0.49.2/0001-only-use-paths-for-shared-libaries-in-get_link_dep_s.patch b/patches/meson-0.51.1/0001-only-use-paths-for-shared-libaries-in-get_link_dep_s.patch similarity index 90% rename from patches/meson-0.49.2/0001-only-use-paths-for-shared-libaries-in-get_link_dep_s.patch rename to patches/meson-0.51.1/0001-only-use-paths-for-shared-libaries-in-get_link_dep_s.patch index 5f32d77905e5..5e2b793b39f7 100644 --- a/patches/meson-0.49.2/0001-only-use-paths-for-shared-libaries-in-get_link_dep_s.patch +++ b/patches/meson-0.51.1/0001-only-use-paths-for-shared-libaries-in-get_link_dep_s.patch @@ -11,10 +11,10 @@ Signed-off-by: Michael Olbrich 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mesonbuild/build.py b/mesonbuild/build.py -index 1fcbc04d330a..9f711b39c86a 100644 +index 55b162974bcc..1c09219c87b7 100644 --- a/mesonbuild/build.py +++ b/mesonbuild/build.py -@@ -753,7 +753,8 @@ class BuildTarget(Target): +@@ -763,7 +763,8 @@ class BuildTarget(Target): def get_link_dep_subdirs(self): result = OrderedSet() for i in self.link_targets: diff --git a/patches/meson-0.49.2/0002-don-t-add-rpaths-for-build-directories-when-cross-co.patch b/patches/meson-0.51.1/0002-don-t-add-rpaths-for-build-directories-when-cross-co.patch similarity index 85% rename from patches/meson-0.49.2/0002-don-t-add-rpaths-for-build-directories-when-cross-co.patch rename to patches/meson-0.51.1/0002-don-t-add-rpaths-for-build-directories-when-cross-co.patch index 897d33ff2e8d..8e722437e60c 100644 --- a/patches/meson-0.49.2/0002-don-t-add-rpaths-for-build-directories-when-cross-co.patch +++ b/patches/meson-0.51.1/0002-don-t-add-rpaths-for-build-directories-when-cross-co.patch @@ -11,10 +11,10 @@ Signed-off-by: Michael Olbrich 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/mesonbuild/compilers/compilers.py b/mesonbuild/compilers/compilers.py -index e27ae2b3b574..b0c01673025b 100644 +index 5855de71c8ae..42e0b90a7ae3 100644 --- a/mesonbuild/compilers/compilers.py +++ b/mesonbuild/compilers/compilers.py -@@ -1181,7 +1181,10 @@ class Compiler: +@@ -1277,7 +1277,10 @@ class Compiler: # Need to deduplicate rpaths, as macOS's install_name_tool # is *very* allergic to duplicate -delete_rpath arguments # when calling depfixer on installation. @@ -26,7 +26,7 @@ index e27ae2b3b574..b0c01673025b 100644 # Build_rpath is used as-is (it is usually absolute). if build_rpath != '': all_paths.add(build_rpath) -@@ -1208,7 +1211,8 @@ class Compiler: +@@ -1304,7 +1307,8 @@ class Compiler: paths = padding else: paths = paths + ':' + padding @@ -34,5 +34,5 @@ index e27ae2b3b574..b0c01673025b 100644 + if paths: + args.append('-Wl,-rpath,' + paths) - if get_compiler_is_linuxlike(self): - # Rpaths to use while linking must be absolute. These are not + if mesonlib.is_sunos(): + return args diff --git a/patches/meson-0.49.2/0003-HACK-don-t-loose-the-rpath-for-host-packages.patch b/patches/meson-0.51.1/0003-HACK-don-t-loose-the-rpath-for-host-packages.patch similarity index 89% rename from patches/meson-0.49.2/0003-HACK-don-t-loose-the-rpath-for-host-packages.patch rename to patches/meson-0.51.1/0003-HACK-don-t-loose-the-rpath-for-host-packages.patch index 054e28dafdd1..4b714b2b6481 100644 --- a/patches/meson-0.49.2/0003-HACK-don-t-loose-the-rpath-for-host-packages.patch +++ b/patches/meson-0.51.1/0003-HACK-don-t-loose-the-rpath-for-host-packages.patch @@ -11,14 +11,14 @@ Signed-off-by: Michael Olbrich 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/mesonbuild/backend/backends.py b/mesonbuild/backend/backends.py -index 4040251373a1..29e4612829a9 100644 +index 085589074d52..30b180c07457 100644 --- a/mesonbuild/backend/backends.py +++ b/mesonbuild/backend/backends.py -@@ -999,9 +999,13 @@ class Backend: +@@ -1077,9 +1077,13 @@ class Backend: # Done separately because of strip/aliases/rpath if outdirs[0] is not False: mappings = t.get_link_deps_mapping(d.prefix, self.environment) -+ if not t.install_rpath and not t.is_cross: ++ if not t.install_rpath and not self.environment.is_cross_build(): + install_rpath = None + else: + install_rpath = t.install_rpath @@ -30,10 +30,10 @@ index 4040251373a1..29e4612829a9 100644 # On toolchains/platforms that use an import library for # linking (separate from the shared library with all the diff --git a/mesonbuild/minstall.py b/mesonbuild/minstall.py -index 8ac6aab1d9a0..f55708e06836 100644 +index ed82c3791a72..e3d5c96eb215 100644 --- a/mesonbuild/minstall.py +++ b/mesonbuild/minstall.py -@@ -476,7 +476,7 @@ class Installer: +@@ -486,7 +486,7 @@ class Installer: print("Symlink creation does not work on this platform. " "Skipping all symlinking.") printed_symlink_error = True diff --git a/patches/meson-0.49.2/series b/patches/meson-0.51.1/series similarity index 68% rename from patches/meson-0.49.2/series rename to patches/meson-0.51.1/series index 9445cad4d919..119016a641c6 100644 --- a/patches/meson-0.49.2/series +++ b/patches/meson-0.51.1/series @@ -3,5 +3,4 @@ 0001-only-use-paths-for-shared-libaries-in-get_link_dep_s.patch 0002-don-t-add-rpaths-for-build-directories-when-cross-co.patch 0003-HACK-don-t-loose-the-rpath-for-host-packages.patch -0004-Don-t-close-fds-when-executing-programs.patch -# 648fdcce3df1dd2e0d3234bdbf0c8bff - git-ptx-patches magic +# 5cb122e1f6a7d12f6e2fc7dd5a2d329b - git-ptx-patches magic diff --git a/rules/host-meson.make b/rules/host-meson.make index 936deafe535b..4e9eccd71351 100644 --- a/rules/host-meson.make +++ b/rules/host-meson.make @@ -14,8 +14,8 @@ HOST_PACKAGES-$(PTXCONF_HOST_MESON) += host-meson # # Paths and names # -HOST_MESON_VERSION := 0.49.2 -HOST_MESON_MD5 := 6132bfb9ff10b2dd7c370045ab18813f +HOST_MESON_VERSION := 0.51.1 +HOST_MESON_MD5 := 60d912510e807a10eb96600b4ec2e522 HOST_MESON := meson-$(HOST_MESON_VERSION) HOST_MESON_SUFFIX := tar.gz HOST_MESON_URL := https://github.com/mesonbuild/meson/archive/$(HOST_MESON_VERSION).$(HOST_MESON_SUFFIX) -- 2.20.1 _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de