rpm/meson
SHA256
1
0
Fork 0
forked from pool/meson
Code Pull Requests Activity

Accepting request 863732 from devel:tools:building

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/863732
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/meson?expand=0&rev=67
This commit is contained in:
Dominique Leuenberger 2021-01-22 20:48:59 +00:00 committed by Git OBS Bridge
commit 0c80bd5ff4
9 changed files with 96 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
7930.patch
View File

@ -1,53 +0,0 @@
From 2b923f532c3e16687910fecb09cedb80a76597cf Mon Sep 17 00:00:00 2001
From: Xavier Claessens <xavier.claessens@collabora.com>
Date: Tue, 3 Nov 2020 09:39:39 -0500
Subject: [PATCH] pkgconfig: Make external deps of static library public
This fix a regression caused by
https://github.com/mesonbuild/meson/pull/7837, it wanted to make
InternalDependency's external_deps private but has side effect of making
StatisLibrary's external_deps private too.
It is technically correct to make them private, but Meson used to make
StaticLibrary deps public so they are usable without `pkg-config
--static` when we know there is only a static library available.
Fixes: #7929.
---
mesonbuild/modules/pkgconfig.py | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/mesonbuild/modules/pkgconfig.py b/mesonbuild/modules/pkgconfig.py
index a863b33c93..62e1c1595c 100644
--- a/mesonbuild/modules/pkgconfig.py
+++ b/mesonbuild/modules/pkgconfig.py
@@ -131,7 +131,7 @@ def _process_libs(self, libs, public):
if obj.found():
processed_libs += obj.get_link_args()
processed_cflags += obj.get_compile_args()
- self._add_lib_dependencies(obj.libraries, obj.whole_libraries, obj.ext_deps, public)
+ self._add_lib_dependencies(obj.libraries, obj.whole_libraries, obj.ext_deps, public, private_external_deps=True)
elif isinstance(obj, dependencies.Dependency):
if obj.found():
processed_libs += obj.get_link_args()
@@ -160,7 +160,7 @@ def _process_libs(self, libs, public):
return processed_libs, processed_reqs, processed_cflags
- def _add_lib_dependencies(self, link_targets, link_whole_targets, external_deps, public):
+ def _add_lib_dependencies(self, link_targets, link_whole_targets, external_deps, public, private_external_deps=False):
add_libs = self.add_pub_libs if public else self.add_priv_libs
# Recursively add all linked libraries
for t in link_targets:
@@ -173,7 +173,10 @@ def _add_lib_dependencies(self, link_targets, link_whole_targets, external_deps,
for t in link_whole_targets:
self._add_link_whole(t, public)
# And finally its external dependencies
- self.add_priv_libs(external_deps)
+ if private_external_deps:
+ self.add_priv_libs(external_deps)
+ else:
+ add_libs(external_deps)
def _add_link_whole(self, t, public):
# Don't include static libraries that we link_whole. But we still need to

3
meson-0.56.0.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:291dd38ff1cd55fcfca8fc985181dd39be0d3e5826e5f0013bf867be40117213
size 1794974

16
meson-0.56.0.tar.gz.asc
View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEElRgfTu0U/fTkG1GNO/RpO/7rlCgFAl+b2MoACgkQO/RpO/7r
lChjlg/6AsKeKgw+2kC9hLp7Fz6qrPUulWfI1uqZ/wCn/nkiWfVVPiyMjvin7KBU
k4t7fFZvEA2mAbp+Itm8LB9sEFlsKL3hGHB14OmKAbTjnjW+L4bPB0IgLvazxv9O
LRoWkxQTJA0deoWCAe0siJ5H7JUabc+1vUToGURTYfrhrmMzTudm/CiRDDpnLsB+
wc6UPfYtpQ6zUB2uF/lWtUqnLU9O3tz5hNnYdzbjbxOTvOo9xo9d5LsnN+omOxIj
bqZq3hcKjlz06WmfabD/KAH13U1iS8+cn1Q15J2l64uKVr0YTgVALprpFXvoDEaW
az0snIk7CPR48D8xEpzyVHR1SGZZMX9AM+o564JMgfRWOWOk9YrQVg3+udh+XLc6
U8RubTNBVzMB7Z8z+ce9KTFLekUDxxwCHSRr+bLcJ8UHbrkSn6fWhalPJ+UZ/pf/
BfSQZ0bMoWBzDI+Ig6C604dNGg6N1rJlJP2X2W7UFjmjqV//snWhLNUvBf+T6du4
sTEeYWs1yaFvIMUuPwACKQ6IDRKgkQOA6TVA1CLQ/1wptOtDfWkcoJm8pW/jXQfZ
7xWg0DwQsCfrrVd11BF484xGUsJVbi8+fBMUug3nJVAW0Rf4i0iAVKUOj81D2BU4
6j0nSK2C3aEU7ZIqrbPtxn2M8lzj0L5tYK+dB1y6U91DrZdQLcc=
=xAl0
-----END PGP SIGNATURE-----

3
meson-0.56.2.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3cb8bdb91383f7f8da642f916e4c44066a29262caa499341e2880f010edb87f4
size 1794847

16
meson-0.56.2.tar.gz.asc Normal file
View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEEGeLW2bRtjapiiPh3wk5jG6ux/nAFAl/6/DsACgkQwk5jG6ux
/nBTtg/+LqbKrBZkZAi6CYRZFsqUKXjFyyWjzc/rNbrG3UPEw3IaUz9lSW/CtK8k
UeK6xG5HNCV4vCxkZUrts28W+RETU1Pfi5Tjw1v8VfO9KMRbpDmqJbJwWcMsDGCc
7bFw5VsKZsyGj9ksV4Xr7LsjIZnXWvlF0+dUpheNN4f3rI4/aOgeeERKl6U7KvHX
pmvWbhyco1XGlC2Q6hfmqEbChKGcqHtMcK3PgG6S2yCv9bKlVIcm0Drp7U/wNIwx
OFf/K8oIIfMBSKNHZBpbjjoy7neOB7NLalZDaroFRDCMQgqYpT/9RbNLeEEEOgIb
KHJ2YrP5m6EP2LiJ7mTnmf8UF05CwMAMVtBl+ozkFwcPfkJrDtaRV+3rcCdgsqWa
f8u2yCMpMFm/fpcqH4aw31OuotxXZ/DxF5dAci6+LWugc5r8R7BlwJclkKTVK9M5
5CXVdN7a8YWwqKidyPyKmNcoF37U37IKfKLIETGkwp5LS/RiLm8z9p2qp9Ydglj9
Cpdl1QTwGODbfQJUi9ufme8W2vd66r5eIUVeE/l7BN8jNSf3doF+p0+z+5/fk5XA
eWtKmd8Mjvd2MMMJy4x0u2g6WmXxi9lWP/aFAGo+sdofDvDtPhvtC5qpiKLyCOJT
BlQp5CD2O1JWoeIFpEmAaPKku032R5UihYHGxyhCnyLXdPb3fLs=
=GZju
-----END PGP SIGNATURE-----

46
meson-suse-ify-macros.patch
View File

@ -1,46 +0,0 @@
--- a/data/macros.meson
+++ b/data/macros.meson
@@ -1,9 +1,15 @@
%__meson %{_bindir}/meson
%__meson_wrap_mode nodownload
%__meson_auto_features enabled
+%_vpath_srcdir .
+%_vpath_builddir build
%meson \
- %set_build_flags \
+ export LANG=C.UTF-8 \
+ export CFLAGS="${CFLAGS:-%optflags}" \
+ export CXXFLAGS="${CXXFLAGS:-%optflags}" \
+ export FFLAGS="${FFLAGS:-%optflags}" \
+ export FCFLAGS="${FCFLAGS:-%optflags}" \
%{shrink:%{__meson} \
--buildtype=plain \
--prefix=%{_prefix} \
@@ -25,21 +31,24 @@
%{nil}}
%meson_build \
+ export LANG=C.UTF-8 \
%{shrink:%{__meson} compile \
-C %{_vpath_builddir} \
- -j %{_smp_build_ncpus} \
+ %{?_smp_mflags} \
--verbose \
%{nil}}
%meson_install \
+ export LANG=C.UTF-8 \
%{shrink:DESTDIR=%{buildroot} %{__meson} install \
-C %{_vpath_builddir} \
--no-rebuild \
%{nil}}
%meson_test \
+ export LANG=C.UTF-8 \
%{shrink:%{__meson} test \
-C %{_vpath_builddir} \
- --num-processes %{_smp_build_ncpus} \
+ %{?jobs:--num-processes %{jobs}} \
--print-errorlogs \
%{nil}}

23
meson.changes
View File

@ -1,3 +1,26 @@
-------------------------------------------------------------------
Sat Jan 16 13:05:47 UTC 2021 - Bjørn Lie <bjorn.lie@gmail.com>
- Update to version 0.56.2:
+ This release fixes a Python 3.5 compat issue.
-------------------------------------------------------------------
Thu Jan 7 13:00:11 UTC 2021 - Bjørn Lie <bjorn.lie@gmail.com>
- Drop meson-suse-ify-macros.patch: No longer needed.
-------------------------------------------------------------------
Wed Jan 6 11:32:14 UTC 2021 - Dominique Leuenberger <dimstar@opensuse.org>
- Update to version 0.56.1:
+ pkgconfig: Make external deps of static library public.
+ interpreter: store correct files for project regeneration.
+ environment: Properly pass linker to rustc.
+ Add aarch64 assembly test.
- Drop 7930.patch: fixed upstream.
- Add new keyid C24E631BABB1FE70 to the keyring (counter signed by
the old key id): the old key was about to expire.
-------------------------------------------------------------------
Tue Nov 17 13:25:10 UTC 2020 - Guillaume GARDET <guillaume.gardet@opensuse.org>

52
meson.keyring
View File

@ -138,3 +138,55 @@ c9R0hR9iXMRTtVF/4M0QjbfswXAhIFDxACfYwIs/uze9Ij5/jGPYMdxzIw3sgkMV
Yk4Wl26lcjaUkwNEwPvTEtq3fjwKoisLbg==
=Smkh
-----END PGP PUBLIC KEY BLOCK-----
-----BEGIN PGP PUBLIC KEY BLOCK-----
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
dxBkBtFt+g3obj4=
=AiRn
-----END PGP PUBLIC KEY BLOCK-----

10
meson.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package meson
#
# Copyright (c) 2020 SUSE LLC
# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -28,7 +28,7 @@
%{!?vim_data_dir:%global vim_data_dir %{_datadir}/vim}
%bcond_with setuptools
Name: meson%{name_ext}
Version: 0.56.0
Version: 0.56.2
Release: 0
Summary: Python-based build system
License: Apache-2.0
@ -37,14 +37,10 @@ URL: http://mesonbuild.com/
Source: https://github.com/%{_name}/meson/releases/download/%{version}/meson-%{version}.tar.gz
Source1: https://github.com/%{_name}/meson/releases/download/%{version}/meson-%{version}.tar.gz.asc
Source2: meson.keyring
# PATCH-FIX-OPENSUSE meson-suse-ify-macros.patch dimstar@opensuse.org -- Make the macros non-RedHat specific: so far there are no separate {C,CXX,F}FLAGS.
Patch0: meson-suse-ify-macros.patch
# PATCH-FIX-OPENSUSE meson-test-installed-bin.patch dimstar@opensuse.org -- We want the test suite to run against /usr/bin/meson coming from our meson package.
Patch1: meson-test-installed-bin.patch
# PATCH-FEATURE-OPENSUSE meson-distutils.patch tchvatal@suse.com -- build and install using distutils instead of full setuptools
Patch2: meson-distutils.patch
# PATCH-FIX-UPSTREAM 7930.patch -- pkgconfig: Make external deps of static library public
Patch3: https://patch-diff.githubusercontent.com/raw/mesonbuild/meson/pull/7930.patch
BuildRequires: fdupes
BuildRequires: python-rpm-macros
BuildRequires: python3-base
@ -159,12 +155,10 @@ This package provides support for meson.build files in Vim.
%prep
%setup -q -n meson-%{version}
%patch0 -p1
%patch1 -p1
%if !%{with setuptools}
%patch2 -p1
%endif
%patch3 -p1
# We do not have gmock available at this moment - can't run the test suite for it
rm -r "test cases/frameworks/3 gmock" \