From b9a71579b82cd54980ff641af504bc8ad96473b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz?= 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. --- groups/000.host_tools.group | 3 -- groups/010.host_deps.group | 39 +++++++++++++++++++------ groups/200.native_packages.group | 3 -- groups/221.native_packages_dev.group | 4 +-- groups/231.native_packages_etc.group | 55 ++++++++++++++++++++++++++++++++++-- groups/251.native_packages_lib.group | 51 +++++++++++++++++++++++++++++++++ groups/800.minipix.group | 3 -- 7 files changed, 136 insertions(+), 22 deletions(-) (limited to 'groups') diff --git a/groups/000.host_tools.group b/groups/000.host_tools.group index aa7cada1..0ac365ba 100644 --- a/groups/000.host_tools.group +++ b/groups/000.host_tools.group @@ -9,9 +9,6 @@ autoconf_host autoconf_2_64_host automake_host automake_1_11_6_host gettext_tiny_host install_strip_host libtool_host m4_host pkgconf_host slibtool_host tpax_host"; HOST_TOOLS_PREFIX="${PREFIX}"; -HOST_TOOLS_SOFORT_NATIVE_CFLAGS="-I${PREFIX}/include"; -HOST_TOOLS_SOFORT_NATIVE_CXXFLAGS="-I${PREFIX}/include"; -HOST_TOOLS_SOFORT_NATIVE_LDFLAGS="-L${PREFIX}/lib -Wl,-rpath,${PREFIX}/lib"; : ${PKG_AUTOCONF_HOST_DEPENDS:="m4_host pkgconf_host slibtool_host"}; : ${PKG_AUTOCONF_HOST_SHA256SUM:=64ebcec9f8ac5b2487125a86a7760d2591ac9e1d3dbd59489633f9de62a57684}; : ${PKG_AUTOCONF_HOST_VERSION:=2.69}; diff --git a/groups/010.host_deps.group b/groups/010.host_deps.group index feab8841..4bfb2c99 100644 --- a/groups/010.host_deps.group +++ b/groups/010.host_deps.group @@ -19,9 +19,6 @@ perk_host python2_host python3_host ruby_host sbsigntools_host sqlite3_host texinfo_host tzdb_host util_linux_host xz_host"; HOST_DEPS_PKG_CONFIG="${PREFIX}/bin/pkgconf"; HOST_DEPS_PREFIX="${PREFIX}"; -HOST_DEPS_SOFORT_NATIVE_CFLAGS="-I${PREFIX}/include"; -HOST_DEPS_SOFORT_NATIVE_CXXFLAGS="-I${PREFIX}/include"; -HOST_DEPS_SOFORT_NATIVE_LDFLAGS="-L${PREFIX}/lib -Wl,-rpath,${PREFIX}/lib"; : ${PKG_BINUTILS_BUILD_DEPENDS:="texinfo_host"}; : ${PKG_BINUTILS_BUILD_SHA256SUM:=250d3b2925c6b211fb16173b0b25bc091c58829fbcad3eb849645e0af52cf7fa}; : ${PKG_BINUTILS_BUILD_VERSION:=2.24.51}; @@ -60,6 +57,14 @@ HOST_DEPS_SOFORT_NATIVE_LDFLAGS="-L${PREFIX}/lib -Wl,-rpath,${PREFIX}/lib"; : ${PKG_CLANG_HOST_VERSION:=3.8.1}; : ${PKG_CLANG_HOST_URL:=http://releases.llvm.org/${PKG_CLANG_HOST_VERSION}/cfe-${PKG_CLANG_HOST_VERSION}.src.tar.xz}; : ${PKG_CLANG_HOST_DISABLED:=1}; +: ${PKG_CLANG_HOST_CMAKE_ARGS_EXTRA:=" + -DCLANG_BUILD_EXAMPLES:BOOL=OFF + -DCLANG_INCLUDE_DOCS:BOOL=OFF + -DCLANG_INCLUDE_TESTS:BOOL=OFF + -DLIBCLANG_BUILD_STATIC:BOOL=ON + -DLLVM_PREFIX=${PREFIX_NATIVE} + -G Unix Makefiles + -Wno-dev"}; : ${PKG_CLZIP_HOST_SHA256SUM:=d9d51212afa80371dc2546d278ef8ebbb3cd57c06fdd761b7b204497586d24c0}; : ${PKG_CLZIP_HOST_VERSION:=1.11}; : ${PKG_CLZIP_HOST_URL:=http://download.savannah.gnu.org/releases/lzip/clzip/clzip-${PKG_CLZIP_HOST_VERSION}.tar.gz}; @@ -69,7 +74,11 @@ HOST_DEPS_SOFORT_NATIVE_LDFLAGS="-L${PREFIX}/lib -Wl,-rpath,${PREFIX}/lib"; : ${PKG_CMAKE_HOST_SHA256SUM:=dc1246c4e6d168ea4d6e042cfba577c1acd65feea27e56f5ff37df920c30cae0}; : ${PKG_CMAKE_HOST_VERSION:=3.7.2}; : ${PKG_CMAKE_HOST_URL:=https://cmake.org/files/v${PKG_CMAKE_HOST_VERSION%.*}/cmake-${PKG_CMAKE_HOST_VERSION}.tar.gz}; -: ${PKG_CMAKE_HOST_CONFIGURE_ARGS:="--parallel=${DEFAULT_BUILD_CPUS} --prefix=${PREFIX}"}; +: ${PKG_CMAKE_HOST_CONFIGURE_TYPE:="cmake"}; +: ${PKG_CMAKE_HOST_CMAKE_ARGS_EXTRA:=" + -DCURSES_NCURSES_LIBRARY=${PREFIX}/lib/libncurses.so +"}; +: ${PKG_CMAKE_HOST_INSTALL_FILES:="../cmake-${PKG_CMAKE_HOST_VERSION}/Modules/Platform/BSDOS.cmake=share/cmake-${PKG_CMAKE_HOST_VERSION%.*}/Modules/Platform/Midipix.cmake"}; : ${PKG_DBUS_HOST_DEPENDS:="expat_host"}; : ${PKG_DBUS_HOST_VERSION:=1.11.20}; : ${PKG_DBUS_HOST_URL:=https://dbus.freedesktop.org/releases/dbus/dbus-${PKG_DBUS_HOST_VERSION}.tar.gz}; @@ -85,6 +94,7 @@ HOST_DEPS_SOFORT_NATIVE_LDFLAGS="-L${PREFIX}/lib -Wl,-rpath,${PREFIX}/lib"; : ${PKG_EXPAT_HOST_VERSION:=2.3.0}; : ${PKG_EXPAT_HOST_URL:=http://download.openpkg.org/components/cache/expat/expat-${PKG_EXPAT_HOST_VERSION}.tar.xz}; : ${PKG_EXPAT_HOST_CONFIGURE_ARGS_EXTRA:="--without-docbook"}; +: ${PKG_EXPAT_HOST_CONFIGURE_TYPE:="autotools"}; : ${PKG_FILE_HOST_SHA256SUM:=f05d286a76d9556243d0cb05814929c2ecf3a5ba07963f8f70bfaaa70517fad1}; : ${PKG_FILE_HOST_VERSION:=5.39}; : ${PKG_FILE_HOST_URL:=http://ftp.astron.com/pub/file/file-${PKG_FILE_HOST_VERSION}.tar.gz}; @@ -153,10 +163,24 @@ HOST_DEPS_SOFORT_NATIVE_LDFLAGS="-L${PREFIX}/lib -Wl,-rpath,${PREFIX}/lib"; : ${PKG_LIBZIP_HOST_SHA256SUM:=a020dc1b17a79faa748e43a05f8605d65e403813e8e97ad3a300a90ddba097ac}; : ${PKG_LIBZIP_HOST_VERSION:=1.7.1}; : ${PKG_LIBZIP_HOST_URL:=https://libzip.org/download/libzip-${PKG_LIBZIP_HOST_VERSION}.tar.xz}; +: ${PKG_LIBZIP_HOST_CMAKE_ARGS_EXTRA:=" + -DENABLE_GNUTLS=:BOOL=OFF + -DENABLE_MBEDTLS=:BOOL=OFF +"}; : ${PKG_LLVM_HOST_SHA256SUM:=6e82ce4adb54ff3afc18053d6981b6aed1406751b8742582ed50f04b5ab475f9}; : ${PKG_LLVM_HOST_VERSION:=3.8.1}; : ${PKG_LLVM_HOST_URL:=http://releases.llvm.org/${PKG_LLVM_HOST_VERSION}/llvm-${PKG_LLVM_HOST_VERSION}.src.tar.xz}; : ${PKG_LLVM_HOST_DISABLED:=1}; +: ${PKG_LLVM_HOST_CMAKE_ARGS_EXTRA:=" + -DCMAKE_BUILD_TYPE=Release + -DLLVM_BUILD_DOCS=NO + -DLLVM_BUILD_EXAMPLES=NO + -DLLVM_BUILD_TESTS=NO + -DLLVM_ENABLE_SPHINX=NO + -DLLVM_TARGETS_TO_BUILD=X86 + -DSPHINX_WARNINGS_AS_ERRORS=NO + -G Unix Makefiles + -Wno-dev"}; : ${PKG_MDSO_HOST_URLS_GIT:="mdso=${DEFAULT_GITROOT}/mdso"}; : ${PKG_MDSO_HOST_CONFIGURE_ARGS:="--prefix="}; : ${PKG_MDSO_HOST_INSTALL_FILES:="@mdso=bin/${DEFAULT_TARGET}-mdso /=${DEFAULT_TARGET}/bin bin/mdso=${DEFAULT_TARGET}/bin/mdso"}; @@ -203,8 +227,7 @@ HOST_DEPS_SOFORT_NATIVE_LDFLAGS="-L${PREFIX}/lib -Wl,-rpath,${PREFIX}/lib"; : ${PKG_PYTHON2_HOST_BUILD_DIR:=build/python2}; : ${PKG_PYTHON2_HOST_CONFIGURE:=build/sbpython2/configure}; : ${PKG_PYTHON2_HOST_CONFIGURE_ARGS:="--source-dir=../../Python-${PKG_PYTHON2_HOST_VERSION} --prefix=${PREFIX}"}; -: ${PKG_PYTHON2_HOST_ENV_VARS_EXTRA:="PYCOMPILE_CFLAGS=-I${PREFIX}/include"}; -: ${PKG_PYTHON2_HOST_SOFORT_FORCE:=1}; +: ${PKG_PYTHON2_HOST_CONFIGURE_TYPE:="sofort"}; : ${PKG_PYTHON2_HOST_MAKEFLAGS_INSTALL_EXTRA:="PREFIX= EXEC_PREFIX= BINDIR=/bin SBINDIR=/sbin LIBDIR=/lib INCLUDEDIR=/include OLDINCLUDEDIR=/include MANDIR=/share/man DOCDIR=/share/doc LIBEXECDIR=/libexec"}; : ${PKG_PYTHON2_HOST_SUBDIR:=Python-${PKG_PYTHON2_HOST_VERSION}}; : ${PKG_PYTHON3_HOST_DEPENDS:="bzip2_host expat_host gdbm_host libffi_host libreadline_host libressl_host libz_host ncurses_host ncursesw_host sqlite3_host xz_host"}; @@ -216,11 +239,9 @@ HOST_DEPS_SOFORT_NATIVE_LDFLAGS="-L${PREFIX}/lib -Wl,-rpath,${PREFIX}/lib"; : ${PKG_PYTHON3_HOST_BUILD_DIR:=build/python3}; : ${PKG_PYTHON3_HOST_CONFIGURE:=build/sbpython3/configure}; : ${PKG_PYTHON3_HOST_CONFIGURE_ARGS:="--source-dir=../../Python-${PKG_PYTHON3_HOST_VERSION} --prefix=${PREFIX}"}; -: ${PKG_PYTHON3_HOST_ENV_VARS_EXTRA:="PYCOMPILE_CFLAGS=-I${PREFIX}/include"}; +: ${PKG_PYTHON3_HOST_CONFIGURE_TYPE:="sofort"}; : ${PKG_PYTHON3_HOST_INSTALL_FILES:="@python3=bin/python"}; : ${PKG_PYTHON3_HOST_MAKEFLAGS_INSTALL_EXTRA:="PREFIX= EXEC_PREFIX= BINDIR=/bin SBINDIR=/sbin LIBDIR=/lib INCLUDEDIR=/include OLDINCLUDEDIR=/include MANDIR=/share/man DOCDIR=/share/doc LIBEXECDIR=/libexec"}; -: ${PKG_PYTHON3_HOST_SOFORT_FORCE:=1}; -: ${PKG_PYTHON3_HOST_SOFORT_NATIVE_CC:="${DEFAULT_HOST_CC}"}; : ${PKG_PYTHON3_HOST_SUBDIR:=Python-${PKG_PYTHON3_HOST_VERSION}}; : ${PKG_RUBY_HOST_SHA256SUM:=ba5ba60e5f1aa21b4ef8e9bf35b9ddb57286cb546aac4b5a28c71f459467e507}; : ${PKG_RUBY_HOST_VERSION:=2.3.0}; diff --git a/groups/200.native_packages.group b/groups/200.native_packages.group index bc4a5061..886fab53 100644 --- a/groups/200.native_packages.group +++ b/groups/200.native_packages.group @@ -12,8 +12,5 @@ NATIVE_PACKAGES_PACKAGES=""; NATIVE_PACKAGES_PKG_CONFIG_LIBDIR="${PREFIX_NATIVE}/lib/pkgconfig"; NATIVE_PACKAGES_PREFIX="${PREFIX_NATIVE}"; NATIVE_PACKAGES_PYTHON="${PREFIX}/bin/python2"; -NATIVE_PACKAGES_SOFORT_NATIVE_CFLAGS="-I${PREFIX}/include"; -NATIVE_PACKAGES_SOFORT_NATIVE_CXXFLAGS="-I${PREFIX}/include"; -NATIVE_PACKAGES_SOFORT_NATIVE_LDFLAGS="-L${PREFIX}/lib -Wl,-rpath,${PREFIX}/lib"; # vim:filetype=sh textwidth=0 diff --git a/groups/221.native_packages_dev.group b/groups/221.native_packages_dev.group index faf237fd..2ebbc07b 100644 --- a/groups/221.native_packages_dev.group +++ b/groups/221.native_packages_dev.group @@ -116,7 +116,7 @@ patch patchutils perl posix_cc python2 python3 ruby sbsigntools smallbasic tk")" : ${PKG_PYTHON2_BUILD_DIR:=build/python2}; : ${PKG_PYTHON2_CONFIGURE:=build/sbpython2/configure}; : ${PKG_PYTHON2_CONFIGURE_ARGS:="--source-dir=../../Python-${PKG_PYTHON2_VERSION} --sysroot=${PREFIX_NATIVE} --prefix= --target=${DEFAULT_TARGET}"}; -: ${PKG_PYTHON2_SOFORT_FORCE:=1}; +: ${PKG_PYTHON2_CONFIGURE_TYPE:="sofort"}; : ${PKG_PYTHON2_SOFORT_NATIVE_CFLAGS_EXTRA:="-std=c99 -D_XOPEN_SOURCE=700"}; : ${PKG_PYTHON2_SUBDIR:=Python-${PKG_PYTHON2_VERSION}}; : ${PKG_PYTHON3_DEPENDS:="bzip2 curl expat gdbm libffi libreadline libressl libz ncursesw sqlite3 xz"}; @@ -128,7 +128,7 @@ patch patchutils perl posix_cc python2 python3 ruby sbsigntools smallbasic tk")" : ${PKG_PYTHON3_BUILD_DIR:=build/python3}; : ${PKG_PYTHON3_CONFIGURE:=build/sbpython3/configure}; : ${PKG_PYTHON3_CONFIGURE_ARGS:="--source-dir=../../Python-${PKG_PYTHON3_VERSION} --sysroot=${PREFIX_NATIVE} --prefix= --target=${DEFAULT_TARGET}"}; -: ${PKG_PYTHON3_SOFORT_FORCE:=1}; +: ${PKG_PYTHON3_CONFIGURE_TYPE:="sofort"}; : ${PKG_PYTHON3_SOFORT_NATIVE_CFLAGS_EXTRA:="-std=c99 -D_XOPEN_SOURCE=700"}; : ${PKG_PYTHON3_INSTALL_FILES:="@python3=bin/python"}; : ${PKG_PYTHON3_SUBDIR:=Python-${PKG_PYTHON3_VERSION}}; diff --git a/groups/231.native_packages_etc.group b/groups/231.native_packages_etc.group index d5819346..66ac9a71 100644 --- a/groups/231.native_packages_etc.group +++ b/groups/231.native_packages_etc.group @@ -67,7 +67,31 @@ zstd")"; : ${PKG_CMAKE_VERSION:=3.7.2}; : ${PKG_CMAKE_URL:=https://cmake.org/files/v${PKG_CMAKE_VERSION%.*}/cmake-${PKG_CMAKE_VERSION}.tar.gz}; : ${PKG_CMAKE_CFLAGS_CONFIGURE_EXTRA:="-g0 -O2"}; -: ${PKG_CMAKE_CONFIGURE_ARGS:="--parallel=${DEFAULT_BUILD_CPUS} --prefix="}; +: ${PKG_CMAKE_CMAKE_ARGS_EXTRA:=" + -DBZIP2_INCLUDE_DIR=${PREFIX_NATIVE}/include + -DBZIP2_LIBRARIES=${PREFIX_NATIVE}/lib/libbz2.a + -DCMAKE_USE_SYSTEM_BZIP2=ON + -DCMAKE_USE_SYSTEM_CURL=ON + -DCMAKE_USE_SYSTEM_EXPAT=OFF + -DCMAKE_USE_SYSTEM_LIBARCHIVE=ON + -DCMAKE_USE_SYSTEM_LIBUV=ON + -DCMAKE_USE_SYSTEM_ZLIB=ON + -DCURL_INCLUDE_DIR=${PREFIX_NATIVE}/include/curl + -DCURL_LIBRARY=${PREFIX_NATIVE}/lib/libcurl.lib.a + -DCURSES_NCURSES_LIBRARY=${PREFIX_NATIVE}/lib/libncurses.lib.a + -DKWSYS_LFS_WORKS=YES + -DLibArchive_INCLUDE_DIR=${PREFIX_NATIVE}/include + -DLibArchive_LIBRARY=${PREFIX_NATIVE}/lib/libarchive.lib.a + -DLIBLZMA_HAS_AUTO_DECODER=YES + -DLIBLZMA_HAS_EASY_ENCODER=YES + -DLIBLZMA_HAS_LZMA_PRESET=YES + -DLIBLZMA_INCLUDE_DIR=${PREFIX_NATIVE}/include + -DLIBLZMA_LIBRARY=${PREFIX_NATIVE}/lib/liblzma.lib.a + -DLibUV_INCLUDE_DIR=${PREFIX_NATIVE}/include + -DLibUV_LIBRARY=${PREFIX_NATIVE}/lib/libuv.1.0.0.lib.a + -DZLIB_INCLUDE_DIR=${PREFIX_NATIVE}/include + -DZLIB_LIBRARY=${PREFIX_NATIVE}/lib/libz.a"}; +: ${PKG_CMAKE_CONFIGURE_TYPE:="cmake"}; : ${PKG_CRON_URLS_GIT:="pkg-cron=https://github.com/lalbornoz/pkg-cron@master"}; : ${PKG_CRON_ENV_VARS_EXTRA:="CC=${DEFAULT_TARGET}-gcc:CFLAGS=${NATIVE_PACKAGES_CFLAGS_CONFIGURE} -D__GNU__"}; : ${PKG_CRON_IN_TREE:=1}; @@ -241,6 +265,17 @@ zstd")"; : ${PKG_MINIZIP_SHA256SUM:=f4c8e7afdd45a093f69d7d338652996766d5473e63ad97a2c5cf89c0787773a0}; : ${PKG_MINIZIP_VERSION:=2.10.4}; : ${PKG_MINIZIP_URL:=https://github.com/nmoinvaz/minizip/archive/${PKG_MINIZIP_VERSION}.tar.gz}; +: ${PKG_MINIZIP_CMAKE_ARGS_EXTRA:=" + -DBUILD_SHARED_LIBS=ON + -DBZIP2_LIBRARIES=${PREFIX_NATIVE}/lib/libbz2.lib.a + -DPKG_CONFIG_EXECUTABLE=${PREFIX}/bin/${DEFAULT_TARGET}-pkg-config + -DMZ_BUILD_TEST=ON + -DMZ_LIBBSD=OFF + -DMZ_LZMA=ON + -DMZ_OPENSSL=ON + -DMZ_ZSTD=OFF + -DZLIB_INCLUDE_DIR=${PREFIX_NATIVE}/include + -DZLIB_LIBRARY_DEBUG=${PREFIX_NATIVE}/lib/libz.lib.a"}; : ${PKG_MINIZIP_SUBDIR:=minizip-ng-${PKG_MINIZIP_VERSION}}; : ${PKG_MINTTY_DEPENDS:="w32api w32lib"}; : ${PKG_MINTTY_URLS_GIT:="mintty=https://github.com/midipix-ports/mintty.git@midipix bmintty=https://github.com/midipix-ports/bmintty.git@main"}; @@ -287,6 +322,18 @@ zstd")"; : ${PKG_OPENJPEG_SHA256SUM:=8702ba68b442657f11aaeb2b338443ca8d5fb95b0d845757968a7be31ef7f16d}; : ${PKG_OPENJPEG_VERSION:=2.4.0}; : ${PKG_OPENJPEG_URL:=https://github.com/uclouvain/openjpeg/archive/v${PKG_OPENJPEG_VERSION}.tar.gz}; +: ${PKG_OPENJPEG_CMAKE_ARGS_EXTRA:=" + -DLCMS2_INCLUDE_DIR=${PREFIX_NATIVE}/include + -DLCMS2_LIBRARY=${PREFIX_NATIVE}/lib/liblcms2.lib.a + -DPNG_LIBRARY_DEBUG=${PREFIX_NATIVE}/lib/libpng.lib.a + -DPNG_LIBRARY_RELEASE=${PREFIX_NATIVE}/lib/libpng.lib.a + -DPNG_PNG_INCLUDE_DIR=${PREFIX_NATIVE}/include + -DTIFF_INCLUDE_DIR=${PREFIX_NATIVE}/include + -DTIFF_LIBRARY_DEBUG=${PREFIX_NATIVE}/lib/libtiff.lib.a + -DTIFF_LIBRARY_RELEASE=${PREFIX_NATIVE}/lib/libtiff.lib.a + -DZLIB_INCLUDE_DIR=${PREFIX_NATIVE}/include + -DZLIB_LIBRARY_DEBUG=${PREFIX_NATIVE}/lib/libz.a + -DZLIB_LIBRARY_RELEASE=${PREFIX_NATIVE}/lib/libz.a"}; : ${PKG_OPENJPEG_SUBDIR:=openjpeg-${PKG_OPENJPEG_VERSION}}; : ${PKG_P7ZIP_URLS_GIT:="p7zip-midipix.git=https://github.com/lalbornoz/p7zip-midipix.git@master"}; : ${PKG_P7ZIP_BUILD_STEPS_DISABLE:=install_make}; @@ -374,6 +421,7 @@ zstd")"; : ${PKG_TDNF_SHA256SUM:=1ca20b176939f32c212f8dec7bfacd99995f1cb16c7f176b90394378ea854b0b}; : ${PKG_TDNF_VERSION:=2.1.1}; : ${PKG_TDNF_URL:=https://github.com/vmware/tdnf/archive/v${PKG_TDNF_VERSION}/tdnf-${PKG_TDNF_VERSION}.tar.gz}; +: ${PKG_TDNF_CMAKE_ARGS_EXTRA:="-DOPENSSL_LIBRARY=${PREFIX_NATIVE}/lib/libcrypto.so"}; : ${PKG_TDNF_IN_TREE:=1}; : ${PKG_TDNF_SUBDIR:=tdnf-${PKG_TDNF_VERSION}}; : ${PKG_TEXINFO_SHA256SUM:=988403c1542d15ad044600b909997ba3079b10e03224c61188117f3676b02caa}; @@ -394,7 +442,6 @@ zstd")"; : ${PKG_TZDB_BUILD_DIR:="tzdb-${PKG_TZDB_VERSION}"}; : ${PKG_TZDB_MAKEFLAGS_INSTALL_EXTRA:="ZIC=${PREFIX}/sbin/zic"}; : ${PKG_UTF8PROC_URLS_GIT:="utf8proc=https://github.com/JuliaStrings/utf8proc@master"}; -: ${PKG_UTF8PROC_IN_TREE:=1}; : ${PKG_UTIL_LINUX_DEPENDS:="ncursesw"}; : ${PKG_UTIL_LINUX_SHA256SUM:=37de03dbb98cdeffdf9e754122b0aca2a9bbdc19769f6570dfcb6f123643bf53}; : ${PKG_UTIL_LINUX_VERSION:=2.36.1}; @@ -427,6 +474,10 @@ zstd")"; : ${PKG_XPDF_SHA256SUM:=52d51dc943b9614b8da66e8662b3031a3c82dc25bfc792eac6b438aa36d549a4}; : ${PKG_XPDF_VERSION:=4.02}; : ${PKG_XPDF_URL:=https://dl.xpdfreader.com/xpdf-${PKG_XPDF_VERSION}.tar.gz}; +: ${PKG_XPDF_CMAKE_ARGS_EXTRA:=" + -DFREETYPE_LIBRARY=${PREFIX_NATIVE}/lib/libfreetype.lib.a + -DFREETYPE_INCLUDE_DIR_ft2build=${PREFIX_NATIVE}/include/ft2build + -DFONTCONFIG_LIBRARY=${PREFIX_NATIVE}/lib/libfontconfig.lib.a"}; : ${PKG_XZ_SHA256SUM:=3e1e518ffc912f86608a8cb35e4bd41ad1aec210df2a47aaa1f95e7f5576ef56}; : ${PKG_XZ_VERSION:=5.2.5}; : ${PKG_XZ_URL:=https://fossies.org/linux/misc/xz-${PKG_XZ_VERSION}.tar.xz}; 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}; diff --git a/groups/800.minipix.group b/groups/800.minipix.group index d5da6268..d7470d7a 100644 --- a/groups/800.minipix.group +++ b/groups/800.minipix.group @@ -21,9 +21,6 @@ MINIPIX_PKG_CONFIG_LIBDIR="${PREFIX_NATIVE}/lib/pkgconfig"; MINIPIX_PKGLIST_DISABLE=1; MINIPIX_PREFIX="${PREFIX}/minipix_dist"; MINIPIX_RPM_DISABLE=1; -MINIPIX_SOFORT_NATIVE_CFLAGS="-I${PREFIX}/include"; -MINIPIX_SOFORT_NATIVE_CXXFLAGS="-I${PREFIX}/include"; -MINIPIX_SOFORT_NATIVE_LDFLAGS="-L${PREFIX}/lib -Wl,-rpath,${PREFIX}/lib"; # # 3rd party packages -- cgit v1.2.3