Accepting request 535997 from devel:tools:building
1 OBS-URL: https://build.opensuse.org/request/show/535997 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/meson?expand=0&rev=25
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
e15b96ef85
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:30bdded6fefc48211d30818d96dd34aae56ee86ce9710476f501bd7695469c4b
|
||||
size 1044794
|
||||
@ -1,16 +0,0 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIzBAABCgAdFiEElRgfTu0U/fTkG1GNO/RpO/7rlCgFAlm4FwMACgkQO/RpO/7r
|
||||
lCgKZw/8DJULItDbOaYeYm8jxlwHBJI13R9I0C84u2MRI88vEhffxAkM/r3K0bK+
|
||||
6KE2VMtpWXxAdvq0Zfb4Q9xn6o+iMkY4W7TMiR6A6bf2xdShvARKom50xzltLVsR
|
||||
V0KNJLQYrVBugcqWRgKtRoP2An3b9W731o24mydX4vxndisU9kLqiQScbIDz2BRf
|
||||
k+4moaEIf/lFFgTXYRuWSopBNRzPY+foQqTMlIv8hS2ZULf90r3s1hc3LBDMCwYT
|
||||
rDsED4NZc4tdI3ajK094U9n4U8sI/s3xDeghZXiMgsgpdOpevR+XQDP0HRMdMEQc
|
||||
YOzHjSXwlVjsmKPts9KWKPBRbqjagKj2oN+npkZDWrWYNN9+obKJmhe5Fx4tgkaP
|
||||
zgCWeSxlvBpHN1GiRsjvmIf87CjlWbRV1PwACSgU4fduXqsNySE+7EM4b6FAGEJ1
|
||||
3r4CfxHVi11mMmeUy70OAly3pLNd6CFQRzJ4sN8n1srqpp/i+b1y9CAobar2L75a
|
||||
81gQzpYZOfOsCxUt2G8e+/4FKaHc8mz3vssEKovi+bRvJsGwKu5L5OwpZAdLiqJc
|
||||
Ky2p9k+wjUH1EY2UIoHtG1hYCO/LM5Vg4l6SpVuHIOrKOlSqQ+fTjukBaMwB5Px9
|
||||
i2sCWlj0Ktl/bG3AMRf8PnEVM6xkskt//UIEjozKbN8eO8VRPjE=
|
||||
=kzfF
|
||||
-----END PGP SIGNATURE-----
|
||||
3
meson-0.43.0.tar.gz
Normal file
3
meson-0.43.0.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:c513eca90e0d70bf14cd1eaafea2fa91cf40a73326a7ff61f08a005048057340
|
||||
size 1066546
|
||||
16
meson-0.43.0.tar.gz.asc
Normal file
16
meson-0.43.0.tar.gz.asc
Normal file
@ -0,0 +1,16 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIzBAABCgAdFiEElRgfTu0U/fTkG1GNO/RpO/7rlCgFAlnaiuQACgkQO/RpO/7r
|
||||
lCicmw/+NHaUsWG+3dG9UbBg8N0+FkGxOkobkAFSFIAwK2faKpHsEu/ka3nzsXln
|
||||
nL3SzlNAx4kuhhFRf4PWRDkVLgeyfdnhp0rouPJ0TIOyGjShBXXzCoRMitw6dxyy
|
||||
ipBUc9p5G/hbcwhPJ45PYOE8/zovbaZuiCujjlqwCl9IwWdNoUAcgzzsvOJzIXWy
|
||||
IGQUKFxPtaMqm1F4CjpDt+yYQXYlzEr9OERSO6E3tk0nzUbvWZ0SyUmO/lF/ZNLV
|
||||
sfZVLN9NBTIbToPVrLVMV/l8RmhAzARzAQrLJaeE500XFrLG7p0RM9QLQRf6UMQj
|
||||
Ims9Cqg/x7ns8b0FwdtBNWHiPDFgYi+iLsKG1fa9/0WEpFKv4nx1P/al+3twdZz+
|
||||
RNFUWolRhnU1W6rczBdB67FZVpcQ1P6Bcq0JDuoBiRrrT08syzMUjLF/oNYMp5dz
|
||||
eK/YmSqTM0F29M+KFGP73fJW9ca737CTChdTNHFsh4R1GPZmnwSqhKXmqf4Qirt9
|
||||
r8LySWJM6jZdNMl1XB7NcFoKkCUSB0rwTkVTY0iVIlKAslmoy1zp9Ivcx71JkSa1
|
||||
OKCCrp3PodMc9qIEvktrf8Oc1FvuZSspBYYVoyICUFzCJFJl1hvi0pLSRC9dlLX/
|
||||
zuCgY0HrhvWYOY39l1bw0cnNDhX6t0SHMzIaC4icdgYw3B9gi4k=
|
||||
=GaA2
|
||||
-----END PGP SIGNATURE-----
|
||||
@ -1,21 +1,21 @@
|
||||
Index: meson-0.42.0/run_project_tests.py
|
||||
Index: meson-0.43.0/run_project_tests.py
|
||||
===================================================================
|
||||
--- meson-0.42.0.orig/run_project_tests.py
|
||||
+++ meson-0.42.0/run_project_tests.py
|
||||
@@ -124,7 +124,7 @@ print_debug = 'MESON_PRINT_TEST_OUTPUT'
|
||||
do_debug = not {'MESON_PRINT_TEST_OUTPUT', 'TRAVIS', 'APPVEYOR'}.isdisjoint(os.environ)
|
||||
no_meson_log_msg = 'No meson-log.txt found.'
|
||||
--- meson-0.43.0.orig/run_project_tests.py
|
||||
+++ meson-0.43.0/run_project_tests.py
|
||||
@@ -126,7 +126,7 @@ no_meson_log_msg = 'No meson-log.txt fou
|
||||
|
||||
system_compiler = None
|
||||
|
||||
-meson_command = os.path.join(os.getcwd(), 'meson')
|
||||
+meson_command = '/usr/bin/meson'
|
||||
if not os.path.exists(meson_command):
|
||||
meson_command += '.py'
|
||||
if not os.path.exists(meson_command):
|
||||
Index: meson-0.42.0/run_unittests.py
|
||||
Index: meson-0.43.0/run_unittests.py
|
||||
===================================================================
|
||||
--- meson-0.42.0.orig/run_unittests.py
|
||||
+++ meson-0.42.0/run_unittests.py
|
||||
@@ -416,11 +416,11 @@ class BasePlatformTests(unittest.TestCas
|
||||
--- meson-0.43.0.orig/run_unittests.py
|
||||
+++ meson-0.43.0/run_unittests.py
|
||||
@@ -459,11 +459,11 @@ class BasePlatformTests(unittest.TestCas
|
||||
# Get the backend
|
||||
# FIXME: Extract this from argv?
|
||||
self.backend = getattr(Backend, os.environ.get('MESON_UNIT_TEST_BACKEND', 'ninja'))
|
||||
|
||||
@ -1,3 +1,47 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Oct 23 12:30:03 UTC 2017 - dimstar@opensuse.org
|
||||
|
||||
- Setup MPI runtime environment before running the test suite.
|
||||
- Remove tests for static boost libraries from
|
||||
test\ cases/frameworks/1\ boost/meson.build.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Oct 19 15:00:49 UTC 2017 - badshah400@gmail.com
|
||||
|
||||
- Update to version 0.43.0:
|
||||
+ Generator learned capture: Generators can now be configured to
|
||||
capture the standard output.
|
||||
+ Can index CustomTarget objects: The CustomTarget object can
|
||||
now be indexed like an array. The resulting object can be used
|
||||
as a source file for other Targets, this will create a
|
||||
dependency on the original CustomTarget, but will only insert
|
||||
the generated file corresponding to the index value of the
|
||||
CustomTarget's output keyword.
|
||||
+ The cross file can now be used for overriding the result of
|
||||
find_program. Then issuing the command find_program('objdump')
|
||||
will return the version specified in the cross file.
|
||||
+ Easier handling of supported compiler arguments.
|
||||
+ Better support for shared libraries in non-system paths: This
|
||||
release adds feature parity to shared libraries that are
|
||||
either in non-standard system paths or shipped as part of your
|
||||
project. On systems that support rpath, Meson automatically
|
||||
adds rpath entries to built targets using manually found
|
||||
external libraries.
|
||||
+ The Wrap dependency system now supports Subversion (svn). This
|
||||
support is rudimentary. The repository url has to point to a
|
||||
specific (sub)directory containing the meson.build file
|
||||
(typically trunk/). However, providing a revision is
|
||||
supported.
|
||||
- Rebase meson-test-installed-bin.patch.
|
||||
- Run sed to strip the hashbang from a non-executable file; this
|
||||
prevents an rpmlint warning.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Oct 11 15:43:16 UTC 2017 - sor.alexei@meowr.ru
|
||||
|
||||
- Don't use obsolete boost-devel for openSUSE Leap 15.0 and newer
|
||||
(boo#1062785).
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Oct 2 14:53:40 CEST 2017 - jdelvare@suse.com
|
||||
|
||||
|
||||
@ -20,11 +20,11 @@
|
||||
%if %{testsuite}
|
||||
%define name_ext -testsuite
|
||||
%else
|
||||
%define name_ext %nil
|
||||
%define name_ext %{nil}
|
||||
%endif
|
||||
%define _name mesonbuild
|
||||
Name: meson%{name_ext}
|
||||
Version: 0.42.1
|
||||
Version: 0.43.0
|
||||
Release: 0
|
||||
Summary: Python-based build system
|
||||
License: Apache-2.0
|
||||
@ -37,13 +37,13 @@ Source2: meson.keyring
|
||||
Patch0: meson-suse-ify-macros.patch
|
||||
# PATCH-FIX-OPENSUSE meson-fix-gcc48.patch sor.alexei@meowr.ru -- Fix GCC 4.8 handling for openSUSE Leap 42.x.
|
||||
Patch1: meson-fix-gcc48.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
|
||||
# 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.
|
||||
Patch100: meson-test-installed-bin.patch
|
||||
BuildRequires: python3 >= 3.4
|
||||
BuildArch: noarch
|
||||
%if %{testsuite}
|
||||
BuildRequires: bison
|
||||
BuildRequires: boost-devel
|
||||
BuildRequires: cups-devel
|
||||
BuildRequires: flex
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: gcc-fortran
|
||||
@ -57,9 +57,10 @@ BuildRequires: gtk-doc
|
||||
BuildRequires: itstool
|
||||
BuildRequires: libpcap-devel
|
||||
BuildRequires: llvm-devel
|
||||
BuildRequires: meson
|
||||
BuildRequires: meson >= %{version}
|
||||
BuildRequires: ncurses-devel
|
||||
BuildRequires: ninja
|
||||
BuildRequires: openmpi-devel
|
||||
BuildRequires: pkgconfig
|
||||
BuildRequires: python3-devel
|
||||
BuildRequires: python3-gobject
|
||||
@ -74,6 +75,14 @@ BuildRequires: pkgconfig(gobject-introspection-1.0)
|
||||
BuildRequires: pkgconfig(gtk+-3.0)
|
||||
BuildRequires: pkgconfig(sdl2)
|
||||
BuildRequires: pkgconfig(zlib)
|
||||
%if 0%{?suse_version} > 1320
|
||||
BuildRequires: libboost_log-devel
|
||||
BuildRequires: libboost_system-devel
|
||||
BuildRequires: libboost_test-devel
|
||||
BuildRequires: libboost_thread-devel
|
||||
%else
|
||||
BuildRequires: boost-devel
|
||||
%endif
|
||||
%else
|
||||
Requires: ninja
|
||||
# meson-gui was last used in openSUSE Leap 42.1.
|
||||
@ -90,7 +99,7 @@ Java, Rust. Build definitions are written in a non-turing complete
|
||||
Domain Specific Language.
|
||||
|
||||
%package vim
|
||||
%{!?vim_data_dir:%global vim_data_dir %_datadir/vim}
|
||||
%{!?vim_data_dir:%global vim_data_dir %{_datadir}/vim}
|
||||
Summary: Vim support for meson.build files
|
||||
Group: Productivity/Text/Editors
|
||||
Requires: vim
|
||||
@ -112,11 +121,16 @@ This package provides support for meson.build files in Vim.
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch100 -p1
|
||||
# Remove static boost tests from test cases/frameworks/1 boost (can't use patch due to spaces in dirname)
|
||||
sed -i "/static/d" test\ cases/frameworks/1\ boost/meson.build
|
||||
|
||||
# We do not have gmock available at this moment - can't run the test suite for it
|
||||
rm -rf "test cases/frameworks/3 gmock" \
|
||||
"test cases/objc/2 nsstring"
|
||||
|
||||
# Remove hashbang from non-exec script
|
||||
sed -i '1{/\/usr\/bin\/env/d;}' ./mesonbuild/rewriter.py
|
||||
|
||||
%build
|
||||
# If this is the test suite, we don't need anything else but the meson package
|
||||
%if ! %{testsuite}
|
||||
@ -148,6 +162,7 @@ install -Dpm 0644 syntax-highlighting/vim/syntax/meson.vim \
|
||||
export LANG=C.UTF-8
|
||||
export MESON_PRINT_TEST_OUTPUT=1
|
||||
export SUSE_ASNEEDED=0
|
||||
source %{_libdir}/mpi/gcc/openmpi/bin/mpivars.sh
|
||||
python3 run_tests.py
|
||||
%endif
|
||||
|
||||
|
||||
@ -1,3 +1,47 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Oct 23 12:30:03 UTC 2017 - dimstar@opensuse.org
|
||||
|
||||
- Setup MPI runtime environment before running the test suite.
|
||||
- Remove tests for static boost libraries from
|
||||
test\ cases/frameworks/1\ boost/meson.build.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Oct 19 15:00:49 UTC 2017 - badshah400@gmail.com
|
||||
|
||||
- Update to version 0.43.0:
|
||||
+ Generator learned capture: Generators can now be configured to
|
||||
capture the standard output.
|
||||
+ Can index CustomTarget objects: The CustomTarget object can
|
||||
now be indexed like an array. The resulting object can be used
|
||||
as a source file for other Targets, this will create a
|
||||
dependency on the original CustomTarget, but will only insert
|
||||
the generated file corresponding to the index value of the
|
||||
CustomTarget's output keyword.
|
||||
+ The cross file can now be used for overriding the result of
|
||||
find_program. Then issuing the command find_program('objdump')
|
||||
will return the version specified in the cross file.
|
||||
+ Easier handling of supported compiler arguments.
|
||||
+ Better support for shared libraries in non-system paths: This
|
||||
release adds feature parity to shared libraries that are
|
||||
either in non-standard system paths or shipped as part of your
|
||||
project. On systems that support rpath, Meson automatically
|
||||
adds rpath entries to built targets using manually found
|
||||
external libraries.
|
||||
+ The Wrap dependency system now supports Subversion (svn). This
|
||||
support is rudimentary. The repository url has to point to a
|
||||
specific (sub)directory containing the meson.build file
|
||||
(typically trunk/). However, providing a revision is
|
||||
supported.
|
||||
- Rebase meson-test-installed-bin.patch.
|
||||
- Run sed to strip the hashbang from a non-executable file; this
|
||||
prevents an rpmlint warning.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Oct 11 15:43:16 UTC 2017 - sor.alexei@meowr.ru
|
||||
|
||||
- Don't use obsolete boost-devel for openSUSE Leap 15.0 and newer
|
||||
(boo#1062785).
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Oct 2 14:53:40 CEST 2017 - jdelvare@suse.com
|
||||
|
||||
|
||||
27
meson.spec
27
meson.spec
@ -20,11 +20,11 @@
|
||||
%if %{testsuite}
|
||||
%define name_ext -testsuite
|
||||
%else
|
||||
%define name_ext %nil
|
||||
%define name_ext %{nil}
|
||||
%endif
|
||||
%define _name mesonbuild
|
||||
Name: meson%{name_ext}
|
||||
Version: 0.42.1
|
||||
Version: 0.43.0
|
||||
Release: 0
|
||||
Summary: Python-based build system
|
||||
License: Apache-2.0
|
||||
@ -37,13 +37,13 @@ Source2: meson.keyring
|
||||
Patch0: meson-suse-ify-macros.patch
|
||||
# PATCH-FIX-OPENSUSE meson-fix-gcc48.patch sor.alexei@meowr.ru -- Fix GCC 4.8 handling for openSUSE Leap 42.x.
|
||||
Patch1: meson-fix-gcc48.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
|
||||
# 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.
|
||||
Patch100: meson-test-installed-bin.patch
|
||||
BuildRequires: python3 >= 3.4
|
||||
BuildArch: noarch
|
||||
%if %{testsuite}
|
||||
BuildRequires: bison
|
||||
BuildRequires: boost-devel
|
||||
BuildRequires: cups-devel
|
||||
BuildRequires: flex
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: gcc-fortran
|
||||
@ -57,9 +57,10 @@ BuildRequires: gtk-doc
|
||||
BuildRequires: itstool
|
||||
BuildRequires: libpcap-devel
|
||||
BuildRequires: llvm-devel
|
||||
BuildRequires: meson
|
||||
BuildRequires: meson >= %{version}
|
||||
BuildRequires: ncurses-devel
|
||||
BuildRequires: ninja
|
||||
BuildRequires: openmpi-devel
|
||||
BuildRequires: pkgconfig
|
||||
BuildRequires: python3-devel
|
||||
BuildRequires: python3-gobject
|
||||
@ -74,6 +75,14 @@ BuildRequires: pkgconfig(gobject-introspection-1.0)
|
||||
BuildRequires: pkgconfig(gtk+-3.0)
|
||||
BuildRequires: pkgconfig(sdl2)
|
||||
BuildRequires: pkgconfig(zlib)
|
||||
%if 0%{?suse_version} > 1320
|
||||
BuildRequires: libboost_log-devel
|
||||
BuildRequires: libboost_system-devel
|
||||
BuildRequires: libboost_test-devel
|
||||
BuildRequires: libboost_thread-devel
|
||||
%else
|
||||
BuildRequires: boost-devel
|
||||
%endif
|
||||
%else
|
||||
Requires: ninja
|
||||
# meson-gui was last used in openSUSE Leap 42.1.
|
||||
@ -90,7 +99,7 @@ Java, Rust. Build definitions are written in a non-turing complete
|
||||
Domain Specific Language.
|
||||
|
||||
%package vim
|
||||
%{!?vim_data_dir:%global vim_data_dir %_datadir/vim}
|
||||
%{!?vim_data_dir:%global vim_data_dir %{_datadir}/vim}
|
||||
Summary: Vim support for meson.build files
|
||||
Group: Productivity/Text/Editors
|
||||
Requires: vim
|
||||
@ -112,11 +121,16 @@ This package provides support for meson.build files in Vim.
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch100 -p1
|
||||
# Remove static boost tests from test cases/frameworks/1 boost (can't use patch due to spaces in dirname)
|
||||
sed -i "/static/d" test\ cases/frameworks/1\ boost/meson.build
|
||||
|
||||
# We do not have gmock available at this moment - can't run the test suite for it
|
||||
rm -rf "test cases/frameworks/3 gmock" \
|
||||
"test cases/objc/2 nsstring"
|
||||
|
||||
# Remove hashbang from non-exec script
|
||||
sed -i '1{/\/usr\/bin\/env/d;}' ./mesonbuild/rewriter.py
|
||||
|
||||
%build
|
||||
# If this is the test suite, we don't need anything else but the meson package
|
||||
%if ! %{testsuite}
|
||||
@ -148,6 +162,7 @@ install -Dpm 0644 syntax-highlighting/vim/syntax/meson.vim \
|
||||
export LANG=C.UTF-8
|
||||
export MESON_PRINT_TEST_OUTPUT=1
|
||||
export SUSE_ASNEEDED=0
|
||||
source %{_libdir}/mpi/gcc/openmpi/bin/mpivars.sh
|
||||
python3 run_tests.py
|
||||
%endif
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user