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.

1 files changed, 51 insertions, 0 deletions

diff --git a/groups/251.native_packages_lib.group b/groups/251.native_packages_lib.group
index fb3c730c..fdad19ab 100644
--- a/groups/251.native_packages_lib.group
+++ b/groups/251.native_packages_lib.group
@@ -107,6 +107,12 @@ libxslt libz libzip lzo nettle sdl1 sdl1_net sdl1_image sdl1_ttf sdl2 sdl2_image
 : ${PKG_LIBJPEG_TURBO_SHA256SUM:=d74b92ac33b0e3657123ddcf6728788c90dc84dcb6a52013d758af3c4af481bb};
 : ${PKG_LIBJPEG_TURBO_VERSION:=2.0.6};
 : ${PKG_LIBJPEG_TURBO_URL:=https://ftp.osuosl.org/pub/blfs/conglomeration/libjpeg-turbo/libjpeg-turbo-${PKG_LIBJPEG_TURBO_VERSION}.tar.gz};
+: ${PKG_LIBJPEG_TURBO_CMAKE_ARGS_EXTRA:="
+	-DCMAKE_ASM_NASM_COMPILER=${PREFIX}/bin/${DEFAULT_TARGET}-nasm
+	-DCMAKE_ASM_NASM_OBJECT_FORMAT=win64
+	-DWITH_SIMD=OFF
+	-DWITH_JPEG8=ON
+"};
 : ${PKG_LIBKSBA_DEPENDS:="libgpg_error"};
 : ${PKG_LIBKSBA_SHA256SUM:=b0f4c65e4e447d9a2349f6b8c0e77a28be9531e4548ba02c545d1f46dc7bf921};
 : ${PKG_LIBKSBA_VERSION:=1.5.1};
@@ -182,11 +188,40 @@ libxslt libz libzip lzo nettle sdl1 sdl1_net sdl1_image sdl1_ttf sdl2 sdl2_image
 : ${PKG_LIBSOLV_VERSION:=0.6.34};
 : ${PKG_LIBSOLV_URL:=https://github.com/openSUSE/libsolv/archive/${PKG_LIBSOLV_VERSION}.tar.gz};
 : ${PKG_LIBSOLV_SUBDIR:=libsolv-${PKG_LIBSOLV_VERSION}};
+: ${PKG_LIBSOLV_CMAKE_ARGS_EXTRA:="
+	-DBZIP2_LIBRARIES=${PREFIX_NATIVE}/lib/libbz2.lib.a
+	-DENABLE_APPDATA:BOOL=ON
+	-DENABLE_BZIP2_COMPRESSION:BOOL=ON
+	-DENABLE_COMPLEX_DEPS:BOOL=ON
+	-DENABLE_COMPS:BOOL=ON
+	-DENABLE_LZMA_COMPRESSION:BOOL=ON
+	-DENABLE_RPMDB:BOOL=ON
+	-DENABLE_RPMDB_BYRPMHEADER:BOOL=ON
+	-DENABLE_RPMDB_LIBRPM:BOOL=ON
+	-DENABLE_RPMMD:BOOL=ON
+	-DENABLE_RPMPKG_LIBRPM:BOOL=ON
+	-DFEDORA=1
+	-DLIBXML2_LIBRARIES=${PREFIX_NATIVE}/lib/libxml2.lib.a
+	-DLZMA_INCLUDE_DIR=${PREFIX_NATIVE}/include
+	-DLZMA_LIBRARY=${PREFIX_NATIVE}/lib/liblzma.lib.a
+	-DRPMIO_LIBRARY=${PREFIX_NATIVE}/lib/librpmio.so
+	-DWITH_LIBXML2:BOOL=ON
+	-DZLIB_INCLUDE_DIR=${PREFIX_NATIVE}/include
+	-DZLIB_LIBRARY=${PREFIX_NATIVE}/lib/libz.a
+"};
 : ${PKG_LIBSSH_DEPENDS:="libz"};
 : ${PKG_LIBSSH_SHA256SUM:=acffef2da98e761fc1fd9c4fddde0f3af60ab44c4f5af05cd1b2d60a3fa08718};
 : ${PKG_LIBSSH_VERSION:=0.9.5};
 : ${PKG_LIBSSH_URL:=https://www.libssh.org/files/${PKG_LIBSSH_VERSION%.*}/libssh-${PKG_LIBSSH_VERSION}.tar.xz};
 : ${PKG_LIBSSH_SUBDIR:=libssh-${PKG_LIBSSH_VERSION}};
+: ${PKG_LIBSSH_CMAKE_ARGS_EXTRA:="
+	-DWITH_EXAMPLES=OFF
+	-DWITH_GCRYPT=ON
+	-DWITH_SYMBOL_VERSIONING=OFF
+	-DZLIB_INCLUDE_DIR=${PREFIX_NATIVE}/include
+	-DZLIB_LIBRARY=${PREFIX_NATIVE}/lib/libz.lib.a
+
+"};
 : ${PKG_LIBSTROPHE_DEPENDS:="libressl expat"};
 : ${PKG_LIBSTROPHE_SHA256SUM:=cf1a363ae6df88ccd97292d4e859b7680d8bac79347b53a9dc8f095456b7a02d};
 : ${PKG_LIBSTROPHE_VERSION=0.10.1};
@@ -243,6 +278,22 @@ libxslt libz libzip lzo nettle sdl1 sdl1_net sdl1_image sdl1_ttf sdl2 sdl2_image
 : ${PKG_LIBZIP_SHA256SUM:=a020dc1b17a79faa748e43a05f8605d65e403813e8e97ad3a300a90ddba097ac};
 : ${PKG_LIBZIP_VERSION:=1.7.1};
 : ${PKG_LIBZIP_URL:=https://libzip.org/download/libzip-${PKG_LIBZIP_VERSION}.tar.xz};
+: ${PKG_LIBZIP_CMAKE_ARGS_EXTRA:="
+	-DBZIP2_INCLUDE_DIR=${PREFIX_NATIVE}/include
+	-DBZIP2_LIBRARIES=${PREFIX_NATIVE}/lib/libbz2.lib.a
+	-DENABLE_GNUTLS=:BOOL=ON
+	-DENABLE_MBEDTLS=:BOOL=OFF
+	-DGNUTLS_INCLUDE_DIR=${PREFIX_NATIVE}/include
+	-DGNUTLS_LIBRARY=${PREFIX_NATIVE}/lib/libgnutls.lib.a
+	-DLIBLZMA_INCLUDE_DIR=${PREFIX_NATIVE}/include                  
+	-DLIBLZMA_LIBRARY=${PREFIX_NATIVE}/lib/liblzma.lib.a            
+	-DNETTLE_INCLUDE_DIR=${PREFIX_NATIVE}/include
+	-DNETTLE_LIBRARY=${PREFIX_NATIVE}/lib/libnettle.lib.a
+	-DOPENSSL_CRYPTO_LIBRARY=${PREFIX_NATIVE}/lib/libcrypto.lib.a
+	-DOPENSSL_SSL_LIBRARY=${PREFIX_NATIVE}/lib/libssl.lib.a
+	-DZLIB_INCLUDE_DIR=${PREFIX_NATIVE}/include
+	-DZLIB_LIBRARY=${PREFIX_NATIVE}/lib/libz.a
+"};
 : ${PKG_LZO_SHA256SUM:=c0f892943208266f9b6543b3ae308fab6284c5c90e627931446fb49b4221a072};
 : ${PKG_LZO_VERSION:=2.10};
 : ${PKG_LZO_URL:=https://www.oberhumer.com/opensource/lzo/download/lzo-${PKG_LZO_VERSION}.tar.gz};