From 4ad93ea7d03277735a8688943d00645dda4efc94 Mon Sep 17 00:00:00 2001
From: Lucía Andrea Illanes Albornoz <lucia@luciaillanes.de>
Date: Mar 20 2023 18:18:30 +0000
Subject: Correctly pass ccache to CMake.


---

diff --git a/build.sh b/build.sh
index 7402a72..da3fb63 100755
--- a/build.sh
+++ b/build.sh
@@ -194,10 +194,10 @@ buildp_init_args_ccache() {
 	local	_bpiac_rstatus="${1#\$}"	\
 		_bpiac_target="";
 
-	if [ "${ARG_CCACHE:-0}" -eq 1 ]; then
+	if [ "${ARG_CCACHE:+1}" = 1 ]; then
 		for _bpiac_target in CROSS HOST NATIVE SOFORT_NATIVE; do
-			eval "DEFAULT_${_bpiac_target}_CC"=\"ccache \${DEFAULT_${_bpiac_target}_CC}\";
-			eval "DEFAULT_${_bpiac_target}_CXX"=\"ccache \${DEFAULT_${_bpiac_target}_CXX}\";
+			eval "DEFAULT_${_bpiac_target}_CC"=\"${ARG_CCACHE} \${DEFAULT_${_bpiac_target}_CC}\";
+			eval "DEFAULT_${_bpiac_target}_CXX"=\"${ARG_CCACHE} \${DEFAULT_${_bpiac_target}_CXX}\";
 		done;
 	fi;
 
@@ -226,7 +226,7 @@ buildp_init_getopts_fn() {
 
 		case "${_bpigf_opt}" in
 		--as-needed)	ARG_AS_NEEDED=1; _bpigf_shiftfl=1; ;;
-		--ccache)	ARG_CCACHE=1; _bpigf_shiftfl=1; ;;
+		--ccache)	ARG_CCACHE="ccache"; _bpigf_shiftfl=1; ;;
 		--debug-minipx)	ARG_DEBUG_MINIPIX=1; _bpigf_shiftfl=1; ;;
 		--help)		_bpigf_shiftfl=1; ;;
 		--reset-state)	ARG_RESET_PKG=1; _bpigf_shiftfl=1; ;;
diff --git a/subr.pkg/pkg_configure.subr b/subr.pkg/pkg_configure.subr
index 8c69600..743ab9d 100644
--- a/subr.pkg/pkg_configure.subr
+++ b/subr.pkg/pkg_configure.subr
@@ -46,7 +46,8 @@ pkgp_configure_autotools() {
 };
 
 pkgp_configure_cmake() {
-	local _ppcc_cmake_args_auto"" _ppcc_build_type="" _ppcc_IFS0="${IFS:- 	}" _ppcc_rc=0 IFS;
+	local	_ppcc_build_type="" _ppcc_cmake_args_auto="" _ppcc_cmd_name=""	\
+		_ppcc_rc=0 _ppcc_vname="" _ppcc_vval="" _ppcc_IFS0="${IFS:- 	}" IFS;
 
 	if [ "${PKG_CMAKE_LISTFILE:+1}" != 1 ]\
 	|| ! [ -e "${PKG_BASE_DIR}/${PKG_SUBDIR}/${PKG_CMAKE_LISTFILE}" ]; then
@@ -63,13 +64,28 @@ pkgp_configure_cmake() {
 		release|*)	_ppcc_build_type="release"; ;;
 		esac;
 
+		for _ppcc_vname in AR CC CXX PKG_CONFIG RANLIB; do
+			_ppcc_vname="PKG_${_ppcc_vname}";
+			if [ "${ARG_CCACHE:+1}" = 1 ]; then
+				eval ${_ppcc_vname}="\${${_ppcc_vname}#${ARG_CCACHE} }";
+			fi;
+			if eval [ '"${'"${_ppcc_vname}"':+1}"' = 1 ]\
+			&& eval [ '"${'"${_ppcc_vname}"'#/}"' = '"${'"${_ppcc_vname}"'}"' ]; then
+				eval _ppcc_cmd_name="\${${_ppcc_vname}% *}";
+				eval _ppcc_vval="\${${_ppcc_vname}#* }";
+				eval ${_ppcc_vname}='$(which "${_ppcc_cmd_name}")' || return 1;
+			fi;
+		done;
+
 		_ppcc_cmake_args_auto="
 			-DCMAKE_AR=${PKG_AR}
 			-DCMAKE_BUILD_TYPE=${_ppcc_build_type}
 			-DCMAKE_C_COMPILER=${PKG_CC}
+			${ARG_CCACHE:+-DCMAKE_C_COMPILER_LAUNCHER=${ARG_CCACHE}}
 			-DCMAKE_C_FLAGS=${PKG_CFLAGS_CONFIGURE:-}${PKG_CFLAGS_CONFIGURE_EXTRA:+ ${PKG_CFLAGS_CONFIGURE_EXTRA}}
 			-DCMAKE_CPP_FLAGS=${PKG_CPPFLAGS_CONFIGURE:-}${PKG_CPPFLAGS_CONFIGURE_EXTRA:+ ${PKG_CPPFLAGS_CONFIGURE_EXTRA}}
 			-DCMAKE_CXX_COMPILER=${PKG_CXX}
+			${ARG_CCACHE:+-DCMAKE_CXX_COMPILER_LAUNCHER=${ARG_CCACHE}}
 			-DCMAKE_CXX_FLAGS=${PKG_CXXFLAGS_CONFIGURE:-}${PKG_CXXFLAGS_CONFIGURE_EXTRA:+ ${PKG_CXXFLAGS_CONFIGURE_EXTRA}}
 			-DCMAKE_EXE_LINKER_FLAGS=${PKG_LDFLAGS_CONFIGURE:-}${PKG_LDFLAGS_CONFIGURE_EXTRA:+ ${PKG_LDFLAGS_CONFIGURE_EXTRA}}
 			-DCMAKE_FIND_ROOT_PATH=${PKG_PREFIX}