pool/meson
SHA256
2
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 445264 from devel:tools:building

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/445264
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/meson?expand=0&rev=12
This commit is contained in:
Dominique Leuenberger 2016-12-12 11:46:57 +00:00 committed by Git OBS Bridge
commit 34f3cfc6ff
3 changed files with 34 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
meson-0.36.0-fix-old-pkgconfig-test.patch Normal file
View File

@ -0,0 +1,25 @@
--- "a/test cases/common/51 pkgconfig-gen/meson.build"
+++ "b/test cases/common/51 pkgconfig-gen/meson.build"
@@ -19,11 +19,17 @@ pkgg.generate(
)
pkgconfig = find_program('pkg-config', required: false)
-if pkgconfig.found() and build_machine.system() != 'windows'
- test('pkgconfig-validation', pkgconfig,
- args: ['--validate', 'simple'],
- env: ['PKG_CONFIG_PATH=' + meson.current_build_dir() + '/meson-private' ],
- )
+if pkgconfig.found()
+ v = run_command(pkgconfig, '--version').stdout().strip()
+ if v.version_compare('>=0.29')
+ test('pkgconfig-validation', pkgconfig,
+ args: ['--validate', 'simple'],
+ env: ['PKG_CONFIG_PATH=' + meson.current_build_dir() + '/meson-private' ])
+ else
+ message('pkg-config version \'' + v + '\' too old, skipping validate test')
+ endif
+else
+ message('pkg-config not found, skipping validate test')
endif
# Test that name_prefix='' and name='libfoo' results in '-lfoo'

6
meson.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Sat Dec 10 20:38:23 UTC 2016 - sor.alexei@meowr.ru
- Add meson-0.36.0-fix-old-pkgconfig-test.patch: tests/common/51:
Skip validate if pkg-config is too old (commit 2f804e9).
-------------------------------------------------------------------
Tue Nov 22 15:04:05 UTC 2016 - dimstar@opensuse.org

3
meson.spec
View File

@ -27,6 +27,8 @@ Url: http://mesonbuild.com/
Source: https://github.com/%{_name}/%{name}/releases/download/%{version}/%{name}-%{version}.tar.gz
Source1: https://github.com/%{_name}/%{name}/releases/download/%{version}/%{name}-%{version}.tar.gz.asc
Source2: %{name}.keyring
# PATCH-FIX-UPSTREAM meson-0.36.0-fix-old-pkgconfig-test.patch nirbheek.chauhan@gmail.com -- tests/common/51: Skip validate if pkg-config is too old (commit 2f804e9).
Patch0: %{name}-0.36.0-fix-old-pkgconfig-test.patch
BuildRequires: bison
BuildRequires: boost-devel
BuildRequires: flex
@ -69,6 +71,7 @@ and the like.
%prep
%setup -q
%patch0 -p1
# Lack of gtest, gmock, gnustep.
rm -rf "test cases/frameworks/2 gtest" \