From b9a71579b82cd54980ff641af504bc8ad96473b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz?=
 <lucio@lucioillanes.de>
Date: Wed, 12 May 2021 22:10:38 +0100
Subject: Implements CMake support.

etc/README.md: updated.
groups/{000.host_tools,010.host_deps,200.native_packages,800.minipix}.group:${*_SOFORT_NATIVE_{C,CXX,LD}FLAGS}: merged into midipix.env.
groups/010.host_deps.group:{clang,cmake_host,libzip,llvm}_host:${PKG_CMAKE_ARGS_EXTRA}: added.
groups/010.host_deps.group:cmake_host:${PKG_CONFIGURE_TYPE}: configure w/ cmake.
groups/010.host_deps.group:cmake_host:${PKG_INSTALL_FILES}: added.
groups/010.host_deps.group:expat_host:${PKG_CONFIGURE_TYPE}: configure w/ autotools.
groups/010.host_deps.group:python[23]_host:${PKG_{ENV_VARS_EXTRA,SOFORT_FORCE}}: removed.
groups/010.host_deps.group:python[23]_host:${PKG_CONFIGURE_TYPE}: configure w/ sofort.
groups/010.host_deps.group:python[23]_host:${PKG_SOFORT_NATIVE_CC}: removed.
groups/221.native_packages_dev.group:python[23]:${PKG_SOFORT_FORCE}: removed.
groups/221.native_packages_dev.group:python[23]:${PKG_CONFIGURE_TYPE}: configure w/ sofort.
groups/231.native_packages_etc.group:{cmake,minizip,openjpeg,tdnf,xpdf}:${PKG_CMAKE_ARGS_EXTRA}: added.
groups/231.native_packages_etc.group:cmake:${PKG_CONFIGURE_ARGS}: removed.
groups/231.native_packages_etc.group:utf8proc:${PKG_IN_TREE}: don't build in-tree.
groups/251.native_packages_lib.group:lib{jpeg_turbo,solv,ssh,zip}:${PKG_CMAKE_ARGS_EXTRA}: added.
midipix.env:${DEFAULT_BUILD_VARS}: adds ${PKG_{CMAKE{,_{ARGS{,_EXTRA},LISTFILE}},CONFIGURE_TYPE},SOFORT_NATIVE_{C{C,XX},{C,CXX,LD}FLAGS,LD}}.
midipix.env:${DEFAULT_BUILD_VARS}: removes ${PKG_SOFORT_FORCE}.
midipix.env:${DEFAULT_{CMAKE_LISTFILE,{CROSS,HOST,NATIVE}_CMAKE}}: added.
subr.rtl/rtl_complex.subr:rtl_export_vars(): ignore values during -u.
subr.rtl/rtl_platform.subr:rtl_set_vars(): updated.
subr/ex_pkg_env.subr:exp_pkg_env_set(): always convert ${PKG_{AR,CC,CXX,PKG_CONFIG,RANLIB}} to absolute pathnames.
subr/ex_pkg_env.subr:ex_pkg_env_sofort(): merged into subr/pkg_configure.subr.
subr/ex_pkg_restart.subr:ex_pkg_process_restart_spec(): remove extraneous echo.
subr/pkg_configure.subr:pkgp_configure_{cmake,sofort}(): initial implementation.
subr/pkg_configure.subr:pkg_configure(): attempt configuration using autotools, sofort, or cmake.
subr/pkg_configure_autotools.subr: skip if ${PKG_CONFIGURE_TYPE} is set and not "autotools".
subr/pkg_fetch_clean.subr: fix typo.
vars/{clang_host,cmake{,_host},lib{jpeg_turbo,solv,ssh,zip{,_host}},llvm_host,lolcode,minizip,openjpeg,tdnf,xpdf}.vars: deleted.
---
 vars/tdnf.vars | 31 -------------------------------
 1 file changed, 31 deletions(-)
 delete mode 100644 vars/tdnf.vars

(limited to 'vars/tdnf.vars')

diff --git a/vars/tdnf.vars b/vars/tdnf.vars
deleted file mode 100644
index c95150c4..00000000
--- a/vars/tdnf.vars
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# set +o errexit -o noglob -o nounset is assumed.
-#
-
-pkg_tdnf_configure() {
-	local _rc=0;
-	rtl_export_vars	\
-		PKG_CONFIG "${PKG_PKG_CONFIG:-}"					\
-		PKG_CONFIG_LIBDIR "${PKG_PKG_CONFIG_LIBDIR:-}";
-	if ! rtl_fileop rm config.cache							\
-	|| ! env CFLAGS="-L${PKG_PREFIX}/lib --sysroot=${PKG_PREFIX}" PREFIX=""		\
-		cmake	-DCMAKE_AR="${PREFIX}/bin/${PKG_AR}"				\
-			-DCMAKE_C_COMPILER="${PREFIX}/bin/${PKG_CC}"			\
-			-DCMAKE_CXX_COMPILER="${PREFIX}/bin/${PKG_TARGET}-g++"		\
-			-DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE="ONLY"			\
-			-DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY="ONLY"			\
-			-DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM="NEVER"			\
-			-DCMAKE_FIND_ROOT_PATH="${PKG_PREFIX}"				\
-			-DCMAKE_INSTALL_PREFIX=""					\
-			-DCMAKE_RANLIB="${PREFIX}/bin/${PKG_RANLIB}"			\
-			-DOPENSSL_LIBRARY="${PKG_PREFIX}/lib/libcrypto.so"		\
-			"../tdnf-${PKG_VERSION}"; then
-		_rc=1;
-	fi;
-	rtl_export_vars	-u \
-		PKG_CONFIG "${PKG_PKG_CONFIG:-}"					\
-		PKG_CONFIG_LIBDIR "${PKG_PKG_CONFIG_LIBDIR:-}";
-	return "${_rc}";
-};
-
-# vim:filetype=sh textwidth=0
-- 
cgit v1.2.3