summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Trofimovich <slyfox@gentoo.org>2018-07-04 22:10:12 +0100
committerSergei Trofimovich <slyfox@gentoo.org>2018-07-04 22:12:45 +0100
commit91f2886698abf49373ce68c5a9bbd655cfa8b5c1 (patch)
tree36e37fcba1feca5199bf224dcf46fb6547d6309d /dev-lang/squirrel
parentapp-crypt/glep63-check: New GLEP 63 key compliance checker (diff)
downloadgentoo-91f2886698abf49373ce68c5a9bbd655cfa8b5c1.tar.gz
gentoo-91f2886698abf49373ce68c5a9bbd655cfa8b5c1.tar.bz2
gentoo-91f2886698abf49373ce68c5a9bbd655cfa8b5c1.zip
Revert "dev-lang/squirrel: declare used CMake variables, bug #659880"
This reverts commit ccc69bc760de2a0cba00f6123349dc4f380b4abb. Eike noticed i've messed up STATIC_LIBS variable handling and static libs are not installed at all. Bug: https://bugs.gentoo.org/659880
Diffstat (limited to 'dev-lang/squirrel')
-rw-r--r--dev-lang/squirrel/files/squirrel-3.1-declare-options.patch10
-rw-r--r--dev-lang/squirrel/squirrel-3.1.ebuild6
2 files changed, 1 insertions, 15 deletions
diff --git a/dev-lang/squirrel/files/squirrel-3.1-declare-options.patch b/dev-lang/squirrel/files/squirrel-3.1-declare-options.patch
deleted file mode 100644
index 11bdbf107ced..000000000000
--- a/dev-lang/squirrel/files/squirrel-3.1-declare-options.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-Explicitly declare used CMake options
-
-Bug: https://bugs.gentoo.org/659880
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1 +1,4 @@
-+option(DISABLE_STATIC "Avoid building/installing static libraries.")
-+option(LONG_OUTPUT_NAMES "Use longer names for binaries and libraries: squirrel3 (not sq).")
-+
- if(MSVC)
diff --git a/dev-lang/squirrel/squirrel-3.1.ebuild b/dev-lang/squirrel/squirrel-3.1.ebuild
index 761fd5c1da25..4a149398eb44 100644
--- a/dev-lang/squirrel/squirrel-3.1.ebuild
+++ b/dev-lang/squirrel/squirrel-3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -17,10 +17,6 @@ IUSE="examples static-libs"
RDEPEND=""
DEPEND="${RDEPEND}"
-PATCHES=(
- "${FILESDIR}"/${P}-declare-options.patch
-)
-
src_configure() {
local mycmakeargs=(
-DINSTALL_LIB_DIR="$(get_libdir)" \