1 |
commit: ccc69bc760de2a0cba00f6123349dc4f380b4abb |
2 |
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Jul 3 21:51:16 2018 +0000 |
4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Jul 3 21:51:53 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ccc69bc7 |
7 |
|
8 |
dev-lang/squirrel: declare used CMake variables, bug #659880 |
9 |
|
10 |
portage's QA check complains: |
11 |
> One or more CMake variables were not used by the project: |
12 |
> DISABLE_STATIC |
13 |
> LONG_OUTPUT_NAMES |
14 |
|
15 |
The warning is misleading. Variables are used but not declared |
16 |
as 'options()'s. This change tweaks the declaration. |
17 |
|
18 |
Reported-by: Toralf Förster |
19 |
Closes: https://bugs.gentoo.org/659880 |
20 |
Package-Manager: Portage-2.3.41, Repoman-2.3.9 |
21 |
|
22 |
dev-lang/squirrel/files/squirrel-3.1-declare-options.patch | 10 ++++++++++ |
23 |
dev-lang/squirrel/squirrel-3.1.ebuild | 6 +++++- |
24 |
2 files changed, 15 insertions(+), 1 deletion(-) |
25 |
|
26 |
diff --git a/dev-lang/squirrel/files/squirrel-3.1-declare-options.patch b/dev-lang/squirrel/files/squirrel-3.1-declare-options.patch |
27 |
new file mode 100644 |
28 |
index 00000000000..11bdbf107ce |
29 |
--- /dev/null |
30 |
+++ b/dev-lang/squirrel/files/squirrel-3.1-declare-options.patch |
31 |
@@ -0,0 +1,10 @@ |
32 |
+Explicitly declare used CMake options |
33 |
+ |
34 |
+Bug: https://bugs.gentoo.org/659880 |
35 |
+--- a/CMakeLists.txt |
36 |
++++ b/CMakeLists.txt |
37 |
+@@ -1 +1,4 @@ |
38 |
++option(DISABLE_STATIC "Avoid building/installing static libraries.") |
39 |
++option(LONG_OUTPUT_NAMES "Use longer names for binaries and libraries: squirrel3 (not sq).") |
40 |
++ |
41 |
+ if(MSVC) |
42 |
|
43 |
diff --git a/dev-lang/squirrel/squirrel-3.1.ebuild b/dev-lang/squirrel/squirrel-3.1.ebuild |
44 |
index 4a149398eb4..761fd5c1da2 100644 |
45 |
--- a/dev-lang/squirrel/squirrel-3.1.ebuild |
46 |
+++ b/dev-lang/squirrel/squirrel-3.1.ebuild |
47 |
@@ -1,4 +1,4 @@ |
48 |
-# Copyright 1999-2017 Gentoo Foundation |
49 |
+# Copyright 1999-2018 Gentoo Foundation |
50 |
# Distributed under the terms of the GNU General Public License v2 |
51 |
|
52 |
EAPI=6 |
53 |
@@ -17,6 +17,10 @@ IUSE="examples static-libs" |
54 |
RDEPEND="" |
55 |
DEPEND="${RDEPEND}" |
56 |
|
57 |
+PATCHES=( |
58 |
+ "${FILESDIR}"/${P}-declare-options.patch |
59 |
+) |
60 |
+ |
61 |
src_configure() { |
62 |
local mycmakeargs=( |
63 |
-DINSTALL_LIB_DIR="$(get_libdir)" \ |