[packages/meson] attempt to fix cmake modules detection on x32; rel 2

atler atler at pld-linux.org
Wed Feb 3 18:06:24 CET 2021


commit 1d7933d78a9dfae3557ca164c584bd3999a2b0a8
Author: Jan Palus <atler at pld-linux.org>
Date:   Wed Feb 3 18:03:35 2021 +0100

    attempt to fix cmake modules detection on x32; rel 2
    
    see https://github.com/mesonbuild/meson/issues/8293

 meson-cmake_deps.patch | 11 +++++++++++
 meson.spec             |  4 +++-
 2 files changed, 14 insertions(+), 1 deletion(-)
---
diff --git a/meson.spec b/meson.spec
index 8628297..74ff660 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.56.2
-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:	52b57dc223e39ae8d84f23a74296a89a
 Patch0:		%{name}-gtkdocdir.patch
+Patch1:		%{name}-cmake_deps.patch
 URL:		http://mesonbuild.com/
 BuildRequires:	ninja >= 1.7
 BuildRequires:	python3 >= 1:3.5.2
@@ -53,6 +54,7 @@ Mesona.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %{__sed} -i -e '1s,/usr/bin/env python3,%{__python3},' \
 	meson.py
diff --git a/meson-cmake_deps.patch b/meson-cmake_deps.patch
new file mode 100644
index 0000000..7fb77fc
--- /dev/null
+++ b/meson-cmake_deps.patch
@@ -0,0 +1,11 @@
+--- meson-0.56.2/mesonbuild/cmake/toolchain.py.orig	2021-01-06 11:39:48.000000000 +0100
++++ meson-0.56.2/mesonbuild/cmake/toolchain.py	2021-02-03 18:01:01.872590064 +0100
+@@ -191,7 +191,7 @@
+             defaults[prefix + 'COMPILER_ID']      = [comp_id]
+             defaults[prefix + 'COMPILER_VERSION'] = [comp_version]
+             #defaults[prefix + 'COMPILER_LOADED']  = ['1']
+-            defaults[prefix + 'COMPILER_FORCED']  = ['1']
++            #defaults[prefix + 'COMPILER_FORCED']  = ['1']
+             defaults[prefix + 'COMPILER_WORKS']   = ['TRUE']
+             #defaults[prefix + 'ABI_COMPILED']     = ['TRUE']
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/meson.git/commitdiff/1d7933d78a9dfae3557ca164c584bd3999a2b0a8



More information about the pld-cvs-commit mailing list