From d55639426aba559e2b2ff43bbddcb93e6867f987 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: May 21 2015 09:47:02 +0000 Subject: accept .S files for assembler Signed-off-by: Igor Gnatenko --- diff --git a/0001-Accept-.S-files-as-assembler-too.patch b/0001-Accept-.S-files-as-assembler-too.patch new file mode 100644 index 0000000..d8d4fb1 --- /dev/null +++ b/0001-Accept-.S-files-as-assembler-too.patch @@ -0,0 +1,34 @@ +From 0ba1d545afe021e09090f434d5242ae942e7d5b4 Mon Sep 17 00:00:00 2001 +From: Jussi Pakkanen +Date: Wed, 20 May 2015 22:32:55 +0300 +Subject: [PATCH] Accept .S files as assembler too. + +--- + compilers.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/compilers.py b/compilers.py +index 6fe7370..5e66b23 100644 +--- a/compilers.py ++++ b/compilers.py +@@ -1043,7 +1043,7 @@ class GnuCCompiler(CCompiler): + return get_gcc_soname_args(self.gcc_type, shlib_name, path, soversion) + + def can_compile(self, filename): +- return super().can_compile(filename) or filename.split('.')[-1] == 's' # Gcc can do asm, too. ++ return super().can_compile(filename) or filename.split('.')[-1].lower() == 's' # Gcc can do asm, too. + + class GnuObjCCompiler(ObjCCompiler): + std_warn_args = ['-Wall', '-Wpedantic', '-Winvalid-pch'] +@@ -1120,7 +1120,7 @@ class ClangCCompiler(CCompiler): + return 'pch' + + def can_compile(self, filename): +- return super().can_compile(filename) or filename.split('.')[-1] == 's' # Clang can do asm, too. ++ return super().can_compile(filename) or filename.split('.')[-1].lower() == 's' # Clang can do asm, too. + + def get_pch_use_args(self, pch_dir, header): + # Workaround for Clang bug http://llvm.org/bugs/show_bug.cgi?id=15136 +-- +2.4.1 + diff --git a/meson.spec b/meson.spec index 6e89419..4885a1a 100644 --- a/meson.spec +++ b/meson.spec @@ -2,12 +2,14 @@ Name: meson Version: 0.23.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: High productivity build system License: ASL 2.0 URL: https://jpakkane.github.io/meson/ Source0: https://github.com/jpakkane/meson/archive/%{version}/%{name}-%{version}.tar.gz +# https://github.com/jpakkane/meson/commit/0ba1d545afe021e09090f434d5242ae942e7d5b4 +Patch0: 0001-Accept-.S-files-as-assembler-too.patch BuildArch: noarch BuildRequires: python3-devel ninja-build @@ -86,6 +88,9 @@ chmod +x %{buildroot}%{_bindir}/meson* %{_mandir}/man1/%{name}gui.1.* %changelog +* Thu May 21 2015 Igor Gnatenko - 0.23.0-3 +- Add patch to accept .S files + * Wed Apr 29 2015 Igor Gnatenko - 0.23.0-2 - Add python3 to Requires (Thanks to Ilya Kyznetsov)