Removed -Werror build flag.

This commit is contained in:
Vitaly Zaitsev 2019-04-10 14:58:58 +02:00
parent 6e37d3cc82
commit 91364e3aad
No known key found for this signature in database
GPG Key ID: BF99FC6DD45AB90A
3 changed files with 31 additions and 2 deletions

25
zimlib-fix-flags.patch Normal file
View File

@ -0,0 +1,25 @@
From f28658b6dd722e548e93f5d45a03ac7c8d078501 Mon Sep 17 00:00:00 2001
From: Vitaly Zaitsev <vitaly@easycoding.org>
Date: Wed, 10 Apr 2019 14:57:47 +0200
Subject: [PATCH 2/2] Removed Werror build flag.
---
meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
index 2d38684..42e5253 100644
--- a/meson.build
+++ b/meson.build
@@ -1,7 +1,7 @@
project('libzim', ['c', 'cpp'],
version : '4.0.6',
license : 'GPL2',
- default_options : ['c_std=c11', 'cpp_std=c++11', 'werror=true'])
+ default_options : ['c_std=c11', 'cpp_std=c++11'])
if build_machine.system() != 'windows'
add_project_arguments('-D_LARGEFILE64_SOURCE=1', '-D_FILE_OFFSET_BITS=64', language: 'cpp')
--
2.20.1

View File

@ -1,7 +1,7 @@
From dd7e0ec915e4ad782328b496677bf7b122282560 Mon Sep 17 00:00:00 2001
From: Vitaly Zaitsev <vitaly@easycoding.org>
Date: Wed, 10 Apr 2019 14:31:32 +0200
Subject: [PATCH] Removed Rpath build.
Subject: [PATCH 1/2] Removed Rpath build.
---
src/meson.build | 4 +---

View File

@ -2,7 +2,7 @@
Name: zimlib
Version: 4.0.6
Release: 2%{?dist}
Release: 3%{?dist}
License: GPLv2 and ASL 2.0 and BSD
Summary: Reference implementation of the ZIM specification
@ -10,6 +10,7 @@ Summary: Reference implementation of the ZIM specification
URL: https://github.com/openzim/%{appname}
Source0: %{url}/archive/%{version}.tar.gz
Patch0: %{name}-no-rpath.patch
Patch1: %{name}-fix-flags.patch
BuildRequires: xapian-core-devel
BuildRequires: libicu-devel
@ -54,6 +55,9 @@ Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
%{_libdir}/pkgconfig/%{appname}.pc
%changelog
* Wed Apr 10 2019 Vitaly Zaitsev <vitaly@easycoding.org> - 4.0.6-3
- Removed Werror build flag.
* Wed Apr 10 2019 Vitaly Zaitsev <vitaly@easycoding.org> - 4.0.6-2
- Removed rpath.