[packages/meson] - added c-links patch: cc.links() function also compiles sources, so should include compiler flags -

qboosh qboosh at pld-linux.org
Mon Mar 18 20:59:01 CET 2019


commit 9842276f665ec22edda88473131a0609b56126fe
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Mon Mar 18 21:04:55 2019 +0100

    - added c-links patch: cc.links() function also compiles sources, so should include compiler flags
    - release 2

 meson-c-links.patch | 25 +++++++++++++++++++++++++
 meson.spec          |  4 +++-
 2 files changed, 28 insertions(+), 1 deletion(-)
---
diff --git a/meson.spec b/meson.spec
index b353255..df0785f 100644
--- a/meson.spec
+++ b/meson.spec
@@ -2,13 +2,14 @@ Summary:	High productivity build system
 Summary(pl.UTF-8):	System budowania o dużej produktywności
 Name:		meson
 Version:	0.50.0
-Release:	1
+Release:	2
 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:	433483107fda4616eaf33de7e7083a84
 Patch0:		%{name}-gtkdocdir.patch
+Patch1:		%{name}-c-links.patch
 URL:		http://mesonbuild.com/
 BuildRequires:	ninja >= 1.5
 BuildRequires:	python3 >= 1:3.5
@@ -52,6 +53,7 @@ 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
new file mode 100644
index 0000000..d465887
--- /dev/null
+++ b/meson-c-links.patch
@@ -0,0 +1,25 @@
+--- 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/9842276f665ec22edda88473131a0609b56126fe



More information about the pld-cvs-commit mailing list