commit: 91f2886698abf49373ce68c5a9bbd655cfa8b5c1 Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> AuthorDate: Wed Jul 4 21:10:12 2018 +0000 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> CommitDate: Wed Jul 4 21:12:45 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91f28866
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 dev-lang/squirrel/files/squirrel-3.1-declare-options.patch | 10 ---------- dev-lang/squirrel/squirrel-3.1.ebuild | 6 +----- 2 files changed, 1 insertion(+), 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 11bdbf107ce..00000000000 --- 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 761fd5c1da2..4a149398eb4 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)" \
