From e9361366f9f8b9fc9b83ac533a1b39c048ba9cf7 Mon Sep 17 00:00:00 2001 From: Igor Raits Date: Mar 05 2021 17:55:31 +0000 Subject: import meson-0.57.1-1.fc35 Signed-off-by: Igor Raits --- diff --git a/.gitignore b/.gitignore index 51be512..5071f37 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/meson-0.55.3.tar.gz +SOURCES/meson-0.57.1.tar.gz diff --git a/.meson.metadata b/.meson.metadata index f31018c..4a41812 100644 --- a/.meson.metadata +++ b/.meson.metadata @@ -1 +1 @@ -6a6ca4d36eb8cdf954beff08c653fc72cf336527 SOURCES/meson-0.55.3.tar.gz +eb87a41d4265aec1223c446c344455b674d4538c SOURCES/meson-0.57.1.tar.gz diff --git a/SOURCES/0001_use_PIE_objects_for_static_libraries.patch b/SOURCES/0001_use_PIE_objects_for_static_libraries.patch deleted file mode 100644 index 5cff687..0000000 --- a/SOURCES/0001_use_PIE_objects_for_static_libraries.patch +++ /dev/null @@ -1,92 +0,0 @@ -From a57d1aaafe47dadaa5fad8b73ec9e2e31bb5f123 Mon Sep 17 00:00:00 2001 -From: Paolo Bonzini -Date: Thu, 8 Oct 2020 15:30:24 +0200 -Subject: [PATCH] build: use PIE objects for static libraries if - b_staticpic=false but b_pie=true - -If static_library is used as a convenience library (e.g. for link_whole) -it should in principle not need position independent code. -However, if the executables that the libraries is linked to are PIE, -the non-PIC objects in the static library will cause linker errors. -To avoid this, obey b_pie for static libraries if either b_staticpic=false -or they use "pic: false". - -Without this patch, QEMU cannot use b_staticpic, which causes a slowdown -on some QEMU benchmarks up to 20%. - -(cherry picked from commit 021d242f9ce8e6cd804af0c1eb4179b8c83fd470) -Signed-off-by: Danilo C. L. de Paula ---- - mesonbuild/backend/backends.py | 2 +- - mesonbuild/build.py | 18 +++++++++++------- - 2 files changed, 12 insertions(+), 8 deletions(-) - -diff --git a/mesonbuild/backend/backends.py b/mesonbuild/backend/backends.py -index c84bb7534..f67efe370 100644 ---- a/mesonbuild/backend/backends.py -+++ b/mesonbuild/backend/backends.py -@@ -694,7 +694,7 @@ class Backend: - # Set -fPIC for static libraries by default unless explicitly disabled - if isinstance(target, build.StaticLibrary) and target.pic: - commands += compiler.get_pic_args() -- if isinstance(target, build.Executable) and target.pie: -+ elif isinstance(target, (build.StaticLibrary, build.Executable)) and target.pie: - commands += compiler.get_pie_args() - # Add compile args needed to find external dependencies. Link args are - # added while generating the link command. -diff --git a/mesonbuild/build.py b/mesonbuild/build.py -index a06979cea..90cbd1aa6 100644 ---- a/mesonbuild/build.py -+++ b/mesonbuild/build.py -@@ -972,13 +972,13 @@ This will become a hard error in a future Meson release.''') - if m.is_darwin() or m.is_windows(): - self.pic = True - else: -- self.pic = self._extract_pic_pie(kwargs, 'pic') -- if isinstance(self, Executable): -+ self.pic = self._extract_pic_pie(kwargs, 'pic', environment, 'b_staticpic') -+ if isinstance(self, Executable) or (isinstance(self, StaticLibrary) and not self.pic): - # Executables must be PIE on Android - if self.environment.machines[self.for_machine].is_android(): - self.pie = True - else: -- self.pie = self._extract_pic_pie(kwargs, 'pie') -+ self.pie = self._extract_pic_pie(kwargs, 'pie', environment, 'b_pie') - self.implicit_include_directories = kwargs.get('implicit_include_directories', True) - if not isinstance(self.implicit_include_directories, bool): - raise InvalidArguments('Implicit_include_directories must be a boolean.') -@@ -990,14 +990,20 @@ This will become a hard error in a future Meson release.''') - if self.gnu_symbol_visibility not in permitted: - raise InvalidArguments('GNU symbol visibility arg {} not one of: {}'.format(self.symbol_visibility, ', '.join(permitted))) - -- def _extract_pic_pie(self, kwargs, arg): -+ def _extract_pic_pie(self, kwargs, arg, environment, option): - # Check if we have -fPIC, -fpic, -fPIE, or -fpie in cflags - all_flags = self.extra_args['c'] + self.extra_args['cpp'] - if '-f' + arg.lower() in all_flags or '-f' + arg.upper() in all_flags: - mlog.warning("Use the '{}' kwarg instead of passing '{}' manually to {!r}".format(arg, '-f' + arg, self.name)) - return True - -- val = kwargs.get(arg, False) -+ if arg in kwargs: -+ val = kwargs[arg] -+ elif option in environment.coredata.base_options: -+ val = environment.coredata.base_options[option].value -+ else: -+ val = False -+ - if not isinstance(val, bool): - raise InvalidArguments('Argument {} to {!r} must be boolean'.format(arg, self.name)) - return val -@@ -1611,8 +1617,6 @@ class StaticLibrary(BuildTarget): - - def __init__(self, name, subdir, subproject, for_machine: MachineChoice, sources, objects, environment, kwargs): - self.typename = 'static library' -- if 'pic' not in kwargs and 'b_staticpic' in environment.coredata.base_options: -- kwargs['pic'] = environment.coredata.base_options['b_staticpic'].value - super().__init__(name, subdir, subproject, for_machine, sources, objects, environment, kwargs) - if 'cs' in self.compilers: - raise InvalidArguments('Static libraries not supported for C#.') --- -2.27.0 - diff --git a/SPECS/meson.spec b/SPECS/meson.spec index b611322..f110bde 100644 --- a/SPECS/meson.spec +++ b/SPECS/meson.spec @@ -1,18 +1,13 @@ %global libname mesonbuild -# Don’t run the tests by default, since they are rather flaky. -# I’ll get to getting them running eventually, but free time is sparse. -# — ekulik -%bcond_with check - Name: meson -Version: 0.55.3 -Release: 3%{?dist} +Version: 0.57.1 +Release: 1%{?dist} Summary: High productivity build system License: ASL 2.0 URL: https://mesonbuild.com/ -Source: https://github.com/mesonbuild/meson/releases/download/%{version}/%{name}-%{version}.tar.gz +Source: https://github.com/mesonbuild/meson/releases/download/%{version}/meson-%{version}.tar.gz BuildArch: noarch @@ -20,59 +15,6 @@ BuildRequires: python3-devel BuildRequires: python3-setuptools Requires: python%{python3_version}dist(setuptools) Requires: ninja-build -Requires: python3-devel - -%if %{with check} -BuildRequires: ninja-build -# Some tests expect the unversioned executable -BuildRequires: /usr/bin/python -# Various languages -BuildRequires: gcc -BuildRequires: libasan -BuildRequires: gcc-c++ -BuildRequires: gcc-gfortran -BuildRequires: gcc-objc -BuildRequires: gcc-objc++ -BuildRequires: java-devel -BuildRequires: libomp-devel -BuildRequires: mono-core mono-devel -BuildRequires: rust -# Since the build is noarch, we can't use %%ifarch -#%%ifarch %%{ldc_arches} -#BuildRequires: ldc -#%%endif -# Various libs support -BuildRequires: boost-devel -BuildRequires: gtest-devel -BuildRequires: gmock-devel -BuildRequires: qt5-qtbase-devel -BuildRequires: qt5-qtbase-private-devel -BuildRequires: qt5-linguist -BuildRequires: vala -BuildRequires: python3-gobject-base -BuildRequires: wxGTK3-devel -BuildRequires: flex -BuildRequires: bison -BuildRequires: gettext -BuildRequires: gnustep-base-devel -BuildRequires: %{_bindir}/gnustep-config -BuildRequires: git-core -BuildRequires: pkgconfig(protobuf) -BuildRequires: pkgconfig(glib-2.0) -BuildRequires: pkgconfig(glib-sharp-2.0) -BuildRequires: pkgconfig(gobject-introspection-1.0) -BuildRequires: gtk-doc -BuildRequires: itstool -BuildRequires: pkgconfig(zlib) -BuildRequires: python3dist(cython) -BuildRequires: pkgconfig(sdl2) -BuildRequires: %{_bindir}/pcap-config -BuildRequires: pkgconfig(vulkan) -BuildRequires: llvm-devel -BuildRequires: cups-devel -%endif - -patch0001: 0001_use_PIE_objects_for_static_libraries.patch %description Meson is a build system designed to optimize programmer @@ -92,16 +34,6 @@ sed -i -e "/^%%__meson /s| .*$| %{_bindir}/%{name}|" data/macros.%{name} %py3_install install -Dpm0644 -t %{buildroot}%{rpmmacrodir} data/macros.%{name} -%if %{with check} -%check -# Remove Boost tests for now, because it requires Python 2 -rm -rf "test cases/frameworks/1 boost" -# Remove MPI tests for now because it is complicated to run -rm -rf "test cases/frameworks/17 mpi" -export MESON_PRINT_TEST_OUTPUT=1 -%{__python3} ./run_tests.py -%endif - %files %license COPYING %{_bindir}/%{name} @@ -113,259 +45,6 @@ export MESON_PRINT_TEST_OUTPUT=1 %dir %{_datadir}/polkit-1/actions %{_datadir}/polkit-1/actions/com.mesonbuild.install.policy - %changelog -* Tue Dec 15 2020 Danilo C. L. de Paula - 0.55.3-3 -- build: use PIE objects for static libraries - Resolves: rhbz#1899620 - (meson builds QEMU with PIC objects instead of PIE) - -* Thu Oct 15 2020 Danilo C. L. de Paula - 0.55.3-2 -- Add python3-devel dependency, as asked by the BZ.. -- Resolves: rhbz#1872692 - -* Thu Oct 08 2020 Danilo de Paula - 0.55.3-1 -- Update to 0.55.3, based on upstream Fedora -- Resolves: rhbz#1872692 - -* Mon Feb 04 2019 Stephen Gallagher - 0.49.2-1 -- Update to 0.49.2 -- Drop upstreamed patch -- Resolves: rhbz#1666733 - -* Mon Dec 10 2018 Stephen Gallagher - 0.45.1-3 -- Backport patch to fix gnome.mkenums_simple() when used with file() arguments - -* Mon Aug 13 2018 Troy Dawson - 0.45.1-2 -- Add Requires python3-devel - -* Wed Mar 21 2018 Igor Gnatenko - 0.45.1-1 -- Update to 0.45.1 - -* Sun Mar 04 2018 Igor Gnatenko - 0.45.0-1 -- Update to 0.45.0 - -* Tue Feb 20 2018 Igor Gnatenko - 0.44.1-1 -- Update to 0.44.1 - -* Thu Feb 08 2018 Fedora Release Engineering - 0.44.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Sun Dec 10 2017 Igor Gnatenko - 0.44.0-1 -- Update to 0.44.0 - -* Mon Oct 09 2017 Igor Gnatenko - 0.43.0-1 -- Update to 0.43.0 - -* Tue Sep 12 2017 Igor Gnatenko - 0.42.1-1 -- Update to 0.42.1 - -* Fri Aug 18 2017 Igor Gnatenko - 0.42.0-1 -- Update to 0.42.0 - -* Wed Jul 26 2017 Fedora Release Engineering - 0.41.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Wed Jul 19 2017 Igor Gnatenko - 0.41.2-1 -- Update to 0.41.2 - -* Tue Jul 18 2017 Kalev Lember - 0.41.1-3 -- Backport various gtk-doc fixes from upstream - -* 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 - -* Tue Jun 13 2017 Igor Gnatenko - 0.41.0-1 -- Update to 0.41.0 - -* Wed May 31 2017 Igor Gnatenko - 0.40.1-2 -- Don't run ldc tests - -* Fri Apr 28 2017 Igor Gnatenko - 0.40.1-1 -- Update to 0.40.1 - -* Sun Apr 23 2017 Igor Gnatenko - 0.40.0-1 -- Update to 0.40.0 - -* Thu Apr 13 2017 Igor Gnatenko - 0.39.1-2 -- Exclude ldc for module builds - -* Thu Mar 16 2017 Igor Gnatenko - 0.39.1-1 -- Update to 0.39.1 - -* Mon Mar 06 2017 Igor Gnatenko - 0.39.0-1 -- Update to 0.39.0 - -* Tue Feb 07 2017 Igor Gnatenko - 0.38.1-1 -- Update to 0.38.1 - -* Sun Jan 29 2017 Igor Gnatenko - 0.38.0-1 -- Update to 0.38.0 - -* Thu Dec 22 2016 Miro Hrončok - 0.37.1-2 -- Rebuild for Python 3.6 - -* Tue Dec 20 2016 Igor Gnatenko - 0.37.1-1 -- Update to 0.37.1 - -* Mon Dec 19 2016 Miro Hrončok - 0.37.0-2 -- Rebuild for Python 3.6 - -* Sun Dec 18 2016 Igor Gnatenko - 0.37.0-1 -- Update to 0.37.0 - -* Thu Dec 15 2016 Igor Gnatenko - 0.36.0-4 -- Backport more RPM macro fixes (FPC ticket #655) - -* Tue Dec 13 2016 Igor Gnatenko - 0.36.0-3 -- Backport fixes to RPM macros - -* Sat Dec 03 2016 Igor Gnatenko - 0.36.0-2 -- Print test output during build - -* Mon Nov 14 2016 Igor Gnatenko - 0.36.0-1 -- Update to 0.36.0 - -* Tue Oct 18 2016 Igor Gnatenko - 0.35.1-1 -- Update to 0.35.1 (RHBZ #1385986) - -* Tue Oct 11 2016 Igor Gnatenko - 0.35.0-3 -- Backport couple of fixes - -* Wed Oct 05 2016 Igor Gnatenko - 0.35.0-2 -- Apply patch to fix FTBFS - -* Mon Oct 03 2016 Igor Gnatenko - 0.35.0-1 -- Update to 0.35.0 - -* Wed Sep 07 2016 Igor Gnatenko - 0.34.0-2 -- Run D test suite - -* Wed Sep 07 2016 Igor Gnatenko - 0.34.0-1 -- Update to 0.34.0 - -* Tue Aug 09 2016 Jon Ciesla - 0.33.0-2 -- Obsoletes fix. - -* Tue Aug 09 2016 Jon Ciesla - 0.33.0-1 -- 0.33.0 -- GUI dropped upstream. - -* Tue Jul 19 2016 Fedora Release Engineering - 0.31.0-2 -- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages - -* Thu Apr 14 2016 Igor Gnatenko - 0.31.0-1 -- Update to 0.31.0 - -* Sun Mar 20 2016 Igor Gnatenko - 0.30.0-1 -- Update to 0.30.0 - -* Thu Feb 04 2016 Fedora Release Engineering - 0.29.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Sun Jan 24 2016 Igor Gnatenko - 0.29.0-1 -- Update to 0.29.0 - -* Fri Jan 15 2016 Jonathan Wakely - 0.28.0-2 -- Rebuilt for Boost 1.60 - -* Mon Dec 28 2015 Igor Gnatenko - 0.28.0-1 -- 0.28.0 - -* Wed Nov 25 2015 Igor Gnatenko - 0.27.0-1 -- 0.27.0 - -* Tue Nov 10 2015 Fedora Release Engineering - 0.26.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5 - -* Fri Oct 30 2015 Igor Gnatenko - 0.26.0-2 -- Fix rpm macros for using optflags - -* Sun Sep 13 2015 Igor Gnatenko - 0.26.0-1 -- 0.26.0 - -* Thu Aug 27 2015 Jonathan Wakely - 0.25.0-4 -- Rebuilt for Boost 1.59 - -* Wed Jul 29 2015 Fedora Release Engineering - 0.25.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159 - -* Wed Jul 22 2015 David Tardon - 0.25.0-2 -- rebuild for Boost 1.58 - -* Sun Jul 12 2015 Igor Gnatenko - 0.25.0-1 -- 0.25.0 - -* Sat Jul 11 2015 Igor Gnatenko - 0.24.0-3 -- Update URLs -- drop unneded hacks in install section -- enable print test output for tests - -* Wed Jun 17 2015 Fedora Release Engineering - 0.24.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Mon May 25 2015 Igor Gnatenko - 0.24.0-1 -- Update to 0.24.0 - -* Thu May 21 2015 Igor Gnatenko - 0.23.0-3.20150328git0ba1d54 -- Update to latest git - -* 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) - -* Tue Mar 31 2015 Igor Gnatenko - 0.23.0-1 -- 0.23.0 - -* Sat Mar 28 2015 Igor Gnatenko - 0.22.0-9.20150328git3b49b71 -- Update to latest git - -* Mon Mar 23 2015 Igor Gnatenko - 0.22.0-9.20150325git18550fe -- Update to latest git -- Include mesonintrospect - -* Mon Mar 23 2015 Igor Gnatenko - 0.22.0-9.20150322git78d31ca -- Fix filelists for mesongui (python-bytecode-without-source) - -* Sun Mar 22 2015 Igor Gnatenko - 0.22.0-8.20150322git78d31ca -- Enable C# tests - -* Sun Mar 22 2015 Igor Gnatenko - 0.22.0-7.20150322git78d31ca -- update to latest git -- fix tests on arm - -* Sat Mar 21 2015 Igor Gnatenko - 0.22.0-7.20150321gita084a8e -- update to latest git - -* Mon Mar 16 2015 Igor Gnatenko - 0.22.0-7.20150316gitfa2c659 -- update to latest git - -* Tue Mar 10 2015 Igor Gnatenko - 0.22.0-7.20150310gitf9f51b1 -- today's git snapshot with support for cool GNOME features -- re-enable wxGTK3 tests, package fixed in rawhide - -* Thu Feb 26 2015 Igor Gnatenko - 0.22.0-6.git7581895 -- split gui to subpkg -- update to latest snapshot -- enable tests - -* Thu Feb 26 2015 Igor Gnatenko - 0.22.0-5.gitc6dbf98 -- Fix packaging style -- Make package noarch - -* Mon Feb 23 2015 Igor Gnatenko - 0.22.0-4.git.c6dbf98 -- Use development version - -* Sat Feb 21 2015 Igor Gnatenko - 0.22.0-3 -- Add ninja-build to requires - -* Thu Jan 22 2015 Igor Gnatenko - 0.22.0-2 -- fix shebang in python files - -* Wed Jan 21 2015 Igor Gnatenko - 0.22.0-1 -- Initial package +* Tue Dec 15 2020 Igor Raits - 0.57.1-1 +- import meson-0.57.1-1.fc35