From 3898ed1cf2ed112d2303dcb8237e01f838cfc467 Mon Sep 17 00:00:00 2001 From: mr-zhang_zx Date: Fri, 23 Dec 2022 13:49:07 +0800 Subject: [PATCH] Add sw arch patch --- meson-0.59.4-sw.patch | 54 +++++++++++++++++++++++++++++++++++++++++++ meson.spec | 6 ++++- 2 files changed, 59 insertions(+), 1 deletion(-) create mode 100644 meson-0.59.4-sw.patch diff --git a/meson-0.59.4-sw.patch b/meson-0.59.4-sw.patch new file mode 100644 index 0000000..ddb339f --- /dev/null +++ b/meson-0.59.4-sw.patch @@ -0,0 +1,54 @@ +diff -Nuar meson-0.59.4/mesonbuild/backend/vs2010backend.py meson-0.59.4-sw/mesonbuild/backend/vs2010backend.py +--- meson-0.59.4/mesonbuild/backend/vs2010backend.py 2021-10-27 22:30:29.000000000 +0000 ++++ meson-0.59.4-sw/mesonbuild/backend/vs2010backend.py 2022-07-20 05:43:19.710000000 +0000 +@@ -182,6 +182,8 @@ + self.platform = 'arm64' + elif 'arm' in target_machine.lower(): + self.platform = 'ARM' ++ elif target_macgube == 'sw_64': ++ self.platform = 'sw_64' + else: + raise MesonException('Unsupported Visual Studio platform: ' + target_machine) + self.buildtype = self.environment.coredata.get_option(OptionKey('buildtype')) +diff -Nuar meson-0.59.4/mesonbuild/dependencies/boost.py meson-0.59.4-sw/mesonbuild/dependencies/boost.py +--- meson-0.59.4/mesonbuild/dependencies/boost.py 2021-10-27 22:30:29.000000000 +0000 ++++ meson-0.59.4-sw/mesonbuild/dependencies/boost.py 2022-07-20 05:44:46.200000000 +0000 +@@ -744,6 +744,7 @@ + 'sparc64': 's64', + 'x86': 'x32', + 'x86_64': 'x64', ++ 'sw_64': 's64', + } + + +diff -Nuar meson-0.59.4/mesonbuild/dependencies/cuda.py meson-0.59.4-sw/mesonbuild/dependencies/cuda.py +--- meson-0.59.4/mesonbuild/dependencies/cuda.py 2021-10-27 22:30:29.000000000 +0000 ++++ meson-0.59.4-sw/mesonbuild/dependencies/cuda.py 2022-07-20 05:46:32.020000000 +0000 +@@ -226,7 +226,7 @@ + raise DependencyException(msg.format(arch, 'Windows')) + return os.path.join('lib', libdirs[arch]) + elif machine.is_linux(): +- libdirs = {'x86_64': 'lib64', 'ppc64': 'lib', 'aarch64': 'lib64', 'loongarch64': 'lib64'} ++ libdirs = {'x86_64': 'lib64', 'ppc64': 'lib', 'aarch64': 'lib64', 'loongarch64': 'lib64', 'sw_64': 'lib'} + if arch not in libdirs: + raise DependencyException(msg.format(arch, 'Linux')) + return libdirs[arch] +diff -Nuar meson-0.59.4/mesonbuild/envconfig.py meson-0.59.4-sw/mesonbuild/envconfig.py +--- meson-0.59.4/mesonbuild/envconfig.py 2021-08-18 11:22:15.000000000 +0000 ++++ meson-0.59.4-sw/mesonbuild/envconfig.py 2022-07-20 05:48:20.340000000 +0000 +@@ -38,6 +38,7 @@ + known_cpu_families = ( + 'aarch64', + 'alpha', ++ 'sw_64', + 'arc', + 'arm', + 'avr', +@@ -75,6 +76,7 @@ + CPU_FAMILIES_64_BIT = [ + 'aarch64', + 'alpha', ++ 'sw_64', + 'ia64', + 'loongarch64', + 'mips64', diff --git a/meson.spec b/meson.spec index cb1f333..8199393 100644 --- a/meson.spec +++ b/meson.spec @@ -1,10 +1,11 @@ Name: meson Version: 0.59.4 -Release: 1 +Release: 2 Summary: An open source high quality build system License: ASL 2.0 URL: https://mesonbuild.com/ Source0: https://github.com/mesonbuild/meson/archive/%{version}/%{name}-%{version}.tar.gz +Patch0: meson-0.59.4-sw.patch BuildArch: noarch Obsoletes: %{name}-gui < 0.31.0-3 @@ -48,6 +49,9 @@ install -Dpm0644 data/macros.%{name} %{buildroot}%{_rpmmacrodir}/macros.%{name} %{_mandir}/man1/%{name}.1* %changelog +* Fri Dec 23 2022 zhangzhixin - 0.59.4-2 +- Add sw arch patch + * Fri Sep 3 2021 hanhui - 0.59.4-1 - Upgrade to 0.59.4 -- Gitee