Gentoo Archives: gentoo-commits

From: Sebastian Pipping <sping@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: games-board/gambit/, games-board/gambit/files/
Date: Mon, 31 Aug 2020 18:01:19
Message-Id: 1598896858.11bab52c6e09ce85a0a2ef8c879f2548c0f0cb40.sping@gentoo
1 commit: 11bab52c6e09ce85a0a2ef8c879f2548c0f0cb40
2 Author: Sebastian Pipping <sping <AT> gentoo <DOT> org>
3 AuthorDate: Mon Aug 31 17:59:18 2020 +0000
4 Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
5 CommitDate: Mon Aug 31 18:00:58 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11bab52c
7
8 games-board/gambit: Respect CFLAGS
9
10 Closes: https://bugs.gentoo.org/739218
11 Signed-off-by: Sebastian Pipping <sping <AT> gentoo.org>
12 Package-Manager: Portage-3.0.0, Repoman-2.3.23
13
14 .../gambit/files/gambit-1.0.4-compile-flags.patch | 28 ++++++++++++++++++++++
15 ...{gambit-1.0.4.ebuild => gambit-1.0.4-r1.ebuild} | 6 ++++-
16 2 files changed, 33 insertions(+), 1 deletion(-)
17
18 diff --git a/games-board/gambit/files/gambit-1.0.4-compile-flags.patch b/games-board/gambit/files/gambit-1.0.4-compile-flags.patch
19 new file mode 100644
20 index 00000000000..c8df686b86a
21 --- /dev/null
22 +++ b/games-board/gambit/files/gambit-1.0.4-compile-flags.patch
23 @@ -0,0 +1,28 @@
24 +From f573e47d095b114e07255537d754ef4ee4bf2885 Mon Sep 17 00:00:00 2001
25 +From: Sebastian Pipping <sebastian@×××××××.org>
26 +Date: Mon, 31 Aug 2020 19:51:56 +0200
27 +Subject: [PATCH] Respect custom CFLAGS and CXXFLAGS
28 +
29 +---
30 + CMakeLists.txt | 4 ++--
31 + 1 file changed, 2 insertions(+), 2 deletions(-)
32 +
33 +diff --git a/CMakeLists.txt b/CMakeLists.txt
34 +index 1be8b83..fa5f5b6 100644
35 +--- a/CMakeLists.txt
36 ++++ b/CMakeLists.txt
37 +@@ -114,9 +114,9 @@ if(POLICY CMP0020)
38 + cmake_policy(SET CMP0020 NEW)
39 + endif()
40 +
41 +-set(CMAKE_C_FLAGS "-Wall -Wextra -Wshadow -Wpointer-arith -Wcast-align -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -Wnested-externs -Wstrict-prototypes -Wbad-function-cast -Wformat=2 -Wundef -pedantic -Wno-long-long")
42 ++set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wshadow -Wpointer-arith -Wcast-align -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -Wnested-externs -Wstrict-prototypes -Wbad-function-cast -Wformat=2 -Wundef -pedantic -Wno-long-long")
43 +
44 +-set(CMAKE_CXX_FLAGS "-std=c++11 -Wall -Wextra -Wshadow -Wpointer-arith -Wcast-align -Wwrite-strings -Wredundant-decls -Wformat=2 -Wundef -pedantic -Wno-long-long")
45 ++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -Wextra -Wshadow -Wpointer-arith -Wcast-align -Wwrite-strings -Wredundant-decls -Wformat=2 -Wundef -pedantic -Wno-long-long")
46 +
47 + if(DEVELOPER_MODE)
48 + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror -pedantic-errors")
49 +--
50 +2.27.0
51 +
52
53 diff --git a/games-board/gambit/gambit-1.0.4.ebuild b/games-board/gambit/gambit-1.0.4-r1.ebuild
54 similarity index 92%
55 rename from games-board/gambit/gambit-1.0.4.ebuild
56 rename to games-board/gambit/gambit-1.0.4-r1.ebuild
57 index e078316f6b2..fd20cc73c5d 100644
58 --- a/games-board/gambit/gambit-1.0.4.ebuild
59 +++ b/games-board/gambit/gambit-1.0.4-r1.ebuild
60 @@ -1,4 +1,4 @@
61 -# Copyright 1999-2017 Gentoo Foundation
62 +# Copyright 1999-2020 Gentoo Authors
63 # Distributed under the terms of the GNU General Public License v2
64
65 EAPI=6
66 @@ -28,6 +28,10 @@ RDEPEND="${DEPEND}"
67
68 S="${WORKDIR}/${MY_P}-src"
69
70 +PATCHES=(
71 + "${FILESDIR}"/${P}-compile-flags.patch
72 +)
73 +
74 src_configure() {
75 local mycmakeargs=(
76 -DCONFIG_ENABLE_UPDATE_CHECKER=OFF