Fix LTO build with meson 0.51
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libwacom?expand=0&rev=27
This commit is contained in:
parent
afdc2bae35
commit
676b65bcef
24
libwacom-meson-0.51-lto.patch
Normal file
24
libwacom-meson-0.51-lto.patch
Normal file
@ -0,0 +1,24 @@
|
|||||||
|
Index: libwacom-1.1/meson.build
|
||||||
|
===================================================================
|
||||||
|
--- libwacom-1.1.orig/meson.build
|
||||||
|
+++ libwacom-1.1/meson.build
|
||||||
|
@@ -533,19 +533,6 @@ if get_option('tests')
|
||||||
|
else
|
||||||
|
message('valgrind not found, disabling valgrind test suite')
|
||||||
|
endif
|
||||||
|
-
|
||||||
|
- # because of the tricks we use in calling the function and exposing
|
||||||
|
- # it to begin with, LTO gets confused and this fails to link.
|
||||||
|
- # Let's just disable it here.
|
||||||
|
- if not get_option('b_lto')
|
||||||
|
- test_deprecated = executable('test-deprecated',
|
||||||
|
- 'test/test-deprecated.c',
|
||||||
|
- dependencies: [dep_libwacom, dep_dl],
|
||||||
|
- include_directories: [includes_src],
|
||||||
|
- c_args: tests_cflags,
|
||||||
|
- install: false)
|
||||||
|
- test('test-deprecated', test_deprecated, suite: ['all'])
|
||||||
|
- endif
|
||||||
|
endif
|
||||||
|
|
||||||
|
# This is a non-optional test
|
@ -1,3 +1,10 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Nov 21 08:30:23 UTC 2019 - Dominique Leuenberger <dimstar@opensuse.org>
|
||||||
|
|
||||||
|
- Add libwacom-meson-0.51-lto.patch: Completely strip the
|
||||||
|
test_deprecated linkingn from meson.build> 174.patch would only
|
||||||
|
properly work with meson 0.52+.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Wed Nov 20 10:06:24 UTC 2019 - Dominique Leuenberger <dimstar@opensuse.org>
|
Wed Nov 20 10:06:24 UTC 2019 - Dominique Leuenberger <dimstar@opensuse.org>
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package libwacom
|
# spec file for package libwacom
|
||||||
#
|
#
|
||||||
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
|
# Copyright (c) 2019 SUSE LLC.
|
||||||
#
|
#
|
||||||
# All modifications and additions to the file contributed by third parties
|
# All modifications and additions to the file contributed by third parties
|
||||||
# remain the property of their copyright owners, unless otherwise agreed
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
@ -33,6 +33,7 @@ Source2: https://github.com/linuxwacom/libwacom/releases/download/%{name}
|
|||||||
Source3: %{name}.keyring
|
Source3: %{name}.keyring
|
||||||
Source99: baselibs.conf
|
Source99: baselibs.conf
|
||||||
Patch0: https://patch-diff.githubusercontent.com/raw/linuxwacom/libwacom/pull/174.patch
|
Patch0: https://patch-diff.githubusercontent.com/raw/linuxwacom/libwacom/pull/174.patch
|
||||||
|
Patch1: libwacom-meson-0.51-lto.patch
|
||||||
%if %{with meson}
|
%if %{with meson}
|
||||||
BuildRequires: meson >= 0.47.0
|
BuildRequires: meson >= 0.47.0
|
||||||
%endif
|
%endif
|
||||||
@ -87,6 +88,7 @@ built-in on-screen tablet", "what is the size of this model", etc.
|
|||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
%patch0 -p1
|
%patch0 -p1
|
||||||
|
%patch1 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%if %{with meson}
|
%if %{with meson}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user