testing/meson
SHA256
3
0
Fork 0
forked from pool/meson
Code Pull Requests Activity

Accepting request 587697 from devel:tools:building

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/587697
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/meson?expand=0&rev=30
This commit is contained in:
Dominique Leuenberger 2018-03-20 20:52:04 +00:00 committed by Git OBS Bridge
commit 6e431508af
4 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
meson-testsuite.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Mar 12 22:04:53 UTC 2018 - dimstar@opensuse.org
- Add libjpeg-devel BuildRequires to test testsuite.
-------------------------------------------------------------------
Mon Mar 5 17:00:19 UTC 2018 - dimstar@opensuse.org

1
meson-testsuite.spec
View File

@ -55,6 +55,7 @@ BuildRequires: gnustep-make
BuildRequires: googletest-devel
BuildRequires: gtk-doc
BuildRequires: itstool
BuildRequires: libjpeg-devel
BuildRequires: libpcap-devel
BuildRequires: libwmf-devel
BuildRequires: llvm-devel

5
meson.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Mar 12 22:04:53 UTC 2018 - dimstar@opensuse.org
- Add libjpeg-devel BuildRequires to test testsuite.
-------------------------------------------------------------------
Mon Mar 5 17:00:19 UTC 2018 - dimstar@opensuse.org

7
meson.spec
View File

@ -39,7 +39,7 @@ Patch0: meson-suse-ify-macros.patch
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.
Patch100: meson-test-installed-bin.patch
BuildRequires: python3 >= 3.4
BuildRequires: python3
BuildArch: noarch
%if %{testsuite}
BuildRequires: bison
@ -55,6 +55,7 @@ BuildRequires: gnustep-make
BuildRequires: googletest-devel
BuildRequires: gtk-doc
BuildRequires: itstool
BuildRequires: libjpeg-devel
BuildRequires: libpcap-devel
BuildRequires: libwmf-devel
BuildRequires: llvm-devel
@ -78,7 +79,7 @@ BuildRequires: pkgconfig(gobject-introspection-1.0)
BuildRequires: pkgconfig(gtk+-3.0)
BuildRequires: pkgconfig(sdl2)
BuildRequires: pkgconfig(zlib)
%if 0%{?suse_version} > 1320
%if 0%{?suse_version} >= 1500
BuildRequires: libboost_log-devel
BuildRequires: libboost_system-devel
BuildRequires: libboost_test-devel
@ -140,7 +141,7 @@ 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}
%if !%{testsuite}
python3 setup.py build
%else
# Ensure we have no mesonbuild / meson in CWD, thus guaranteeing we use meson in $PATH