| 1 |
commit: 91f2886698abf49373ce68c5a9bbd655cfa8b5c1 |
| 2 |
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jul 4 21:10:12 2018 +0000 |
| 4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jul 4 21:12:45 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91f28866 |
| 7 |
|
| 8 |
Revert "dev-lang/squirrel: declare used CMake variables, bug #659880" |
| 9 |
|
| 10 |
This reverts commit ccc69bc760de2a0cba00f6123349dc4f380b4abb. |
| 11 |
Eike noticed i've messed up STATIC_LIBS variable handling |
| 12 |
and static libs are not installed at all. |
| 13 |
|
| 14 |
Bug: https://bugs.gentoo.org/659880 |
| 15 |
|
| 16 |
dev-lang/squirrel/files/squirrel-3.1-declare-options.patch | 10 ---------- |
| 17 |
dev-lang/squirrel/squirrel-3.1.ebuild | 6 +----- |
| 18 |
2 files changed, 1 insertion(+), 15 deletions(-) |
| 19 |
|
| 20 |
diff --git a/dev-lang/squirrel/files/squirrel-3.1-declare-options.patch b/dev-lang/squirrel/files/squirrel-3.1-declare-options.patch |
| 21 |
deleted file mode 100644 |
| 22 |
index 11bdbf107ce..00000000000 |
| 23 |
--- a/dev-lang/squirrel/files/squirrel-3.1-declare-options.patch |
| 24 |
+++ /dev/null |
| 25 |
@@ -1,10 +0,0 @@ |
| 26 |
-Explicitly declare used CMake options |
| 27 |
- |
| 28 |
-Bug: https://bugs.gentoo.org/659880 |
| 29 |
---- a/CMakeLists.txt |
| 30 |
-+++ b/CMakeLists.txt |
| 31 |
-@@ -1 +1,4 @@ |
| 32 |
-+option(DISABLE_STATIC "Avoid building/installing static libraries.") |
| 33 |
-+option(LONG_OUTPUT_NAMES "Use longer names for binaries and libraries: squirrel3 (not sq).") |
| 34 |
-+ |
| 35 |
- if(MSVC) |
| 36 |
|
| 37 |
diff --git a/dev-lang/squirrel/squirrel-3.1.ebuild b/dev-lang/squirrel/squirrel-3.1.ebuild |
| 38 |
index 761fd5c1da2..4a149398eb4 100644 |
| 39 |
--- a/dev-lang/squirrel/squirrel-3.1.ebuild |
| 40 |
+++ b/dev-lang/squirrel/squirrel-3.1.ebuild |
| 41 |
@@ -1,4 +1,4 @@ |
| 42 |
-# Copyright 1999-2018 Gentoo Foundation |
| 43 |
+# Copyright 1999-2017 Gentoo Foundation |
| 44 |
# Distributed under the terms of the GNU General Public License v2 |
| 45 |
|
| 46 |
EAPI=6 |
| 47 |
@@ -17,10 +17,6 @@ IUSE="examples static-libs" |
| 48 |
RDEPEND="" |
| 49 |
DEPEND="${RDEPEND}" |
| 50 |
|
| 51 |
-PATCHES=( |
| 52 |
- "${FILESDIR}"/${P}-declare-options.patch |
| 53 |
-) |
| 54 |
- |
| 55 |
src_configure() { |
| 56 |
local mycmakeargs=( |
| 57 |
-DINSTALL_LIB_DIR="$(get_libdir)" \ |
Archives