From: Andreas Sturmlechner <asturm@gentoo.org>
Date: Sun, 16 Sep 2018 08:52:36 +0000 (+0200)
Subject: cmake-utils.eclass: Move CMAKE_USER_MAKE_RULES_OVERRIDE to gentoo config
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=f198fdc373429429e347c7c8b6273254a66d4076;p=gentoo.git

cmake-utils.eclass: Move CMAKE_USER_MAKE_RULES_OVERRIDE to gentoo config

Closes: https://bugs.gentoo.org/631522
---

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index d69c79f83b41..98f5fa41b55a 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -610,6 +610,7 @@ cmake-utils_src_configure() {
 		SET (CMAKE_INSTALL_LIBDIR ${libdir} CACHE PATH "Output directory for libraries")
 		SET (CMAKE_INSTALL_INFODIR "${EPREFIX}/usr/share/info" CACHE PATH "")
 		SET (CMAKE_INSTALL_MANDIR "${EPREFIX}/usr/share/man" CACHE PATH "")
+		SET (CMAKE_USER_MAKE_RULES_OVERRIDE "${build_rules}" CACHE FILEPATH "Gentoo override rules")
 	_EOF_
 	[[ "${NOCOLOR}" = true || "${NOCOLOR}" = yes ]] && echo 'SET (CMAKE_COLOR_MAKEFILE OFF CACHE BOOL "pretty colors during make" FORCE)' >> "${common_config}"
 
@@ -668,7 +669,6 @@ cmake-utils_src_configure() {
 		"${mycmakeargs_local[@]}"
 		-DCMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE}"
 		$([[ ${EAPI} == 5 ]] && echo -DCMAKE_INSTALL_DO_STRIP=OFF)
-		-DCMAKE_USER_MAKE_RULES_OVERRIDE="${build_rules}"
 		-DCMAKE_TOOLCHAIN_FILE="${toolchain_file}"
 		"${MYCMAKEARGS}"
 	)