[packages/meson] - updated to 0.51.2 - removed obsolete c-links patch

qboosh qboosh at pld-linux.org
Wed Sep 11 20:51:58 CEST 2019


commit 9c750441652fddd079cab91d59530bdcc1b7c781
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Wed Sep 11 20:54:51 2019 +0200

    - updated to 0.51.2
    - removed obsolete c-links patch

 meson-c-links.patch | 25 -------------------------
 meson.spec          |  6 ++----
 2 files changed, 2 insertions(+), 29 deletions(-)
---
diff --git a/meson.spec b/meson.spec
index 70b03e3..896d168 100644
--- a/meson.spec
+++ b/meson.spec
@@ -1,15 +1,14 @@
 Summary:	High productivity build system
 Summary(pl.UTF-8):	System budowania o dużej produktywności
 Name:		meson
-Version:	0.50.1
+Version:	0.51.2
 Release:	1
 License:	Apache v2.0
 Group:		Development/Tools
 #Source0Download: https://github.com/mesonbuild/meson/releases/
 Source0:	https://github.com/mesonbuild/meson/releases/download/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5:	24a6527796115828d2ebc75880e18d62
+# Source0-md5:	d46c4a8e3cfd27f90e2c6fe4a69e574b
 Patch0:		%{name}-gtkdocdir.patch
-Patch1:		%{name}-c-links.patch
 URL:		http://mesonbuild.com/
 BuildRequires:	ninja >= 1.5
 BuildRequires:	python3 >= 1:3.5
@@ -54,7 +53,6 @@ Mesona.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %{__sed} -i -e '1s,/usr/bin/env python3,%{__python3},' \
 	meson.py
diff --git a/meson-c-links.patch b/meson-c-links.patch
deleted file mode 100644
index d465887..0000000
--- a/meson-c-links.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- meson-0.50.0/mesonbuild/compilers/c.py.orig	2019-02-28 21:43:18.000000000 +0100
-+++ meson-0.50.0/mesonbuild/compilers/c.py	2019-03-17 16:19:08.275202577 +0100
-@@ -425,10 +425,8 @@
-             for_machine = MachineChoice.BUILD
-         else:
-             for_machine = MachineChoice.HOST
--        if mode == 'preprocess':
--            # Add CPPFLAGS from the env.
--            args += env.coredata.get_external_preprocess_args(for_machine, self.language)
--        elif mode == 'compile':
-+        # 'link' mode contains also 'compile' stage
-+        if mode in {'compile', 'link'}:
-             # Add CFLAGS/CXXFLAGS/OBJCFLAGS/OBJCXXFLAGS from the env
-             sys_args = env.coredata.get_external_args(for_machine, self.language)
-             # Apparently it is a thing to inject linker flags both
-@@ -437,6 +435,9 @@
-             # argument checks. Thanks, Autotools.
-             cleaned_sys_args = self.remove_linkerlike_args(sys_args)
-             args += cleaned_sys_args
-+        if mode == 'preprocess':
-+            # Add CPPFLAGS from the env.
-+            args += env.coredata.get_external_preprocess_args(for_machine, self.language)
-         elif mode == 'link':
-             # Add LDFLAGS from the env
-             args += env.coredata.get_external_link_args(for_machine, self.language)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/meson.git/commitdiff/9c750441652fddd079cab91d59530bdcc1b7c781



More information about the pld-cvs-commit mailing list