diff --git a/0001-pkgconfig-avoid-appending-slash-at-Cflags.patch b/0001-pkgconfig-avoid-appending-slash-at-Cflags.patch new file mode 100644 index 0000000..5a197f7 --- /dev/null +++ b/0001-pkgconfig-avoid-appending-slash-at-Cflags.patch @@ -0,0 +1,34 @@ +From 167275763b7eb418b083b2eeb489108047b5d81b Mon Sep 17 00:00:00 2001 +From: Laurent Carlier +Date: Tue, 11 Jul 2017 13:42:59 +0200 +Subject: [PATCH] pkgconfig: avoid appending slash at Cflags + +otherwise it can break some compilations, see https://bugs.archlinux.org/task/54763 + +(cherry picked from commit 0283a2fb41fb4c25be1d0078bb40ae761d47462a) +--- + mesonbuild/modules/pkgconfig.py | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/mesonbuild/modules/pkgconfig.py b/mesonbuild/modules/pkgconfig.py +index 09c615ab..c044d91e 100644 +--- a/mesonbuild/modules/pkgconfig.py ++++ b/mesonbuild/modules/pkgconfig.py +@@ -96,10 +96,11 @@ class PkgConfigModule(ExtensionModule): + ofile.write('Libs.private: {}\n'.format(' '.join(generate_libs_flags(priv_libs)))) + ofile.write('Cflags:') + for h in subdirs: +- if h == '.': +- h = '' + ofile.write(' ') +- ofile.write(os.path.join('-I${includedir}', h)) ++ if h == '.': ++ ofile.write('-I${includedir}') ++ else: ++ ofile.write(os.path.join('-I${includedir}', h)) + ofile.write('\n') + + def process_libs(self, libs): +-- +2.13.2 + diff --git a/meson.spec b/meson.spec index 6f6c1c1..95a92e8 100644 --- a/meson.spec +++ b/meson.spec @@ -2,12 +2,16 @@ Name: meson Version: 0.41.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: High productivity build system License: ASL 2.0 URL: http://mesonbuild.com/ Source0: https://github.com/mesonbuild/meson/archive/%{version}/%{name}-%{version}.tar.gz + +# https://github.com/mesonbuild/meson/commit/0283a2fb41fb4c25be1d0078bb40ae761d47462a +Patch0001: 0001-pkgconfig-avoid-appending-slash-at-Cflags.patch + BuildArch: noarch Obsoletes: %{name}-gui < 0.31.0-3 @@ -99,6 +103,9 @@ export MESON_PRINT_TEST_OUTPUT=1 %{rpmmacrodir}/macros.%{name} %changelog +* Thu Jul 13 2017 Igor Gnatenko - 0.41.1-2 +- Strip trailing slash from pkg-config files + * Mon Jun 19 2017 Igor Gnatenko - 0.41.1-1 - Update to 0.41.1