From f8873a43b33e73f3238ce328b63551bbd5b2be6c Mon Sep 17 00:00:00 2001 From: Ribbon Date: Wed, 8 Oct 2025 14:55:56 -0300 Subject: [PATCH] Try to fix more CMake-based recipes --- recipes/wip/libs/other/libdeflate/recipe.toml | 20 +++---------------- recipes/wip/libs/other/libebml/recipe.toml | 20 +++---------------- recipes/wip/libs/other/libeigen/recipe.toml | 20 +++---------------- recipes/wip/libs/other/libevent/recipe.toml | 14 +------------ recipes/wip/libs/other/libfmt/recipe.toml | 20 +++---------------- recipes/wip/libs/other/libgav1/recipe.toml | 20 +++---------------- recipes/wip/libs/other/libgdal/recipe.toml | 20 +++---------------- recipes/wip/libs/other/libgit2/recipe.toml | 20 +++---------------- .../wip/libs/other/libgrantlee/recipe.toml | 20 +++---------------- recipes/wip/libs/other/libhidapi/recipe.toml | 20 +++---------------- 10 files changed, 28 insertions(+), 166 deletions(-) diff --git a/recipes/wip/libs/other/libdeflate/recipe.toml b/recipes/wip/libs/other/libdeflate/recipe.toml index 34f65cb8..f3b2e790 100644 --- a/recipes/wip/libs/other/libdeflate/recipe.toml +++ b/recipes/wip/libs/other/libdeflate/recipe.toml @@ -1,20 +1,6 @@ -#TODO probably wrong script, see https://github.com/ebiggers/libdeflate#building +#TODO not compiled or tested +# build instructions: https://github.com/ebiggers/libdeflate#building [source] tar = "https://github.com/ebiggers/libdeflate/releases/download/v1.19/libdeflate-1.19.tar.gz" [build] -template = "custom" -script = """ -COOKBOOK_CONFIGURE="cmake" -COOKBOOK_CONFIGURE_FLAGS=( - -DCMAKE_BUILD_TYPE=Release - -DCMAKE_CROSSCOMPILING=True - -DCMAKE_EXE_LINKER_FLAGS="-static" - -DCMAKE_INSTALL_PREFIX="/" - -DCMAKE_PREFIX_PATH="${COOKBOOK_SYSROOT}" - -DCMAKE_SYSTEM_NAME=Generic - -DCMAKE_SYSTEM_PROCESSOR="$(echo "${TARGET}" | cut -d - -f1)" - -DCMAKE_VERBOSE_MAKEFILE=On -"${COOKBOOK_SOURCE}" -) -cookbook_configure -""" +template = "cmake" diff --git a/recipes/wip/libs/other/libebml/recipe.toml b/recipes/wip/libs/other/libebml/recipe.toml index 55e5e998..886d0e64 100644 --- a/recipes/wip/libs/other/libebml/recipe.toml +++ b/recipes/wip/libs/other/libebml/recipe.toml @@ -1,20 +1,6 @@ -#TODO probably wrong script, see https://github.com/Matroska-Org/libebml#building-and-installing +#TODO not compiled or tested +# build instructions: https://github.com/Matroska-Org/libebml#building-and-installing [source] tar = "https://dl.matroska.org/downloads/libebml/libebml-1.4.4.tar.xz" [build] -template = "custom" -script = """ -COOKBOOK_CONFIGURE="cmake" -COOKBOOK_CONFIGURE_FLAGS=( - -DCMAKE_BUILD_TYPE=Release - -DCMAKE_CROSSCOMPILING=True - -DCMAKE_EXE_LINKER_FLAGS="-static" - -DCMAKE_INSTALL_PREFIX="/" - -DCMAKE_PREFIX_PATH="${COOKBOOK_SYSROOT}" - -DCMAKE_SYSTEM_NAME=Generic - -DCMAKE_SYSTEM_PROCESSOR="$(echo "${TARGET}" | cut -d - -f1)" - -DCMAKE_VERBOSE_MAKEFILE=On -"${COOKBOOK_SOURCE}" -) -cookbook_configure -""" +template = "cmake" diff --git a/recipes/wip/libs/other/libeigen/recipe.toml b/recipes/wip/libs/other/libeigen/recipe.toml index d47a471d..7167c7a9 100644 --- a/recipes/wip/libs/other/libeigen/recipe.toml +++ b/recipes/wip/libs/other/libeigen/recipe.toml @@ -1,21 +1,7 @@ -#TODO maybe incomplete script, see https://gitlab.com/libeigen/eigen/-/blob/master/INSTALL?ref_type=heads +#TODO not compiled or tested +# build instructions: https://gitlab.com/libeigen/eigen/-/blob/master/INSTALL?ref_type=heads [source] git = "https://gitlab.com/libeigen/eigen" rev = "3147391d946bb4b6c68edd901f2add6ac1f31f8c" [build] -template = "custom" -script = """ -COOKBOOK_CONFIGURE="cmake" -COOKBOOK_CONFIGURE_FLAGS=( - -DCMAKE_BUILD_TYPE=Release - -DCMAKE_CROSSCOMPILING=True - -DCMAKE_EXE_LINKER_FLAGS="-static" - -DCMAKE_INSTALL_PREFIX="/" - -DCMAKE_PREFIX_PATH="${COOKBOOK_SYSROOT}" - -DCMAKE_SYSTEM_NAME=Generic - -DCMAKE_SYSTEM_PROCESSOR="$(echo "${TARGET}" | cut -d - -f1)" - -DCMAKE_VERBOSE_MAKEFILE=On -"${COOKBOOK_SOURCE}" -) -cookbook_configure -""" +template = "cmake" diff --git a/recipes/wip/libs/other/libevent/recipe.toml b/recipes/wip/libs/other/libevent/recipe.toml index 8b6843e0..669ef8eb 100644 --- a/recipes/wip/libs/other/libevent/recipe.toml +++ b/recipes/wip/libs/other/libevent/recipe.toml @@ -11,19 +11,7 @@ dependencies = [ "openssl1", ] script = """ -COOKBOOK_CONFIGURE="cmake" -COOKBOOK_CONFIGURE_FLAGS=( - -DCMAKE_BUILD_TYPE=Release - -DCMAKE_CROSSCOMPILING=True - -DCMAKE_INSTALL_PREFIX="${COOKBOOK_STAGE}/" - -DCMAKE_PREFIX_PATH="${COOKBOOK_SYSROOT}" - -DCMAKE_SYSTEM_NAME=Generic - -DCMAKE_SYSTEM_PROCESSOR="$(echo "${TARGET}" | cut -d - -f1)" - -DCMAKE_VERBOSE_MAKEFILE=On - -DEVENT__LIBRARY_TYPE=STATIC -"${COOKBOOK_SOURCE}" -) - +DYNAMIC_INIT # Can't call `cookbook_configure` because it sets DESTDIR (which causes an error) "${COOKBOOK_CONFIGURE}" "${COOKBOOK_CONFIGURE_FLAGS[@]}" "${COOKBOOK_MAKE}" -j "${COOKBOOK_MAKE_JOBS}" diff --git a/recipes/wip/libs/other/libfmt/recipe.toml b/recipes/wip/libs/other/libfmt/recipe.toml index ba81a679..718baa3c 100644 --- a/recipes/wip/libs/other/libfmt/recipe.toml +++ b/recipes/wip/libs/other/libfmt/recipe.toml @@ -1,21 +1,7 @@ -#TODO probably wrong script, see https://fmt.dev/latest/usage.html#building-the-library +#TODO not compiled or tested +# build instructions: https://fmt.dev/latest/usage.html#building-the-library [source] git = "https://github.com/fmtlib/fmt" rev = "f5e54359df4c26b6230fc61d38aa294581393084" [build] -template = "custom" -script = """ -COOKBOOK_CONFIGURE="cmake" -COOKBOOK_CONFIGURE_FLAGS=( - -DCMAKE_BUILD_TYPE=Release - -DCMAKE_CROSSCOMPILING=True - -DCMAKE_EXE_LINKER_FLAGS="-static" - -DCMAKE_INSTALL_PREFIX="/" - -DCMAKE_PREFIX_PATH="${COOKBOOK_SYSROOT}" - -DCMAKE_SYSTEM_NAME=Generic - -DCMAKE_SYSTEM_PROCESSOR="$(echo "${TARGET}" | cut -d - -f1)" - -DCMAKE_VERBOSE_MAKEFILE=On -"${COOKBOOK_SOURCE}" -) -cookbook_configure -""" +template = "cmake" diff --git a/recipes/wip/libs/other/libgav1/recipe.toml b/recipes/wip/libs/other/libgav1/recipe.toml index cd6307f6..37e502a1 100644 --- a/recipes/wip/libs/other/libgav1/recipe.toml +++ b/recipes/wip/libs/other/libgav1/recipe.toml @@ -1,21 +1,7 @@ -#TODO maybe incomplete script, see https://chromium.googlesource.com/codecs/libgav1/#compile +#TODO not compiled or tested +# build instructions: https://chromium.googlesource.com/codecs/libgav1/#compile [source] git = "https://chromium.googlesource.com/codecs/libgav1" rev = "e386d8f1fb983200972d159b9be47fd5d0776708" [build] -template = "custom" -script = """ -COOKBOOK_CONFIGURE="cmake" -COOKBOOK_CONFIGURE_FLAGS=( - -DCMAKE_BUILD_TYPE=Release - -DCMAKE_CROSSCOMPILING=True - -DCMAKE_EXE_LINKER_FLAGS="-static" - -DCMAKE_INSTALL_PREFIX="/" - -DCMAKE_PREFIX_PATH="${COOKBOOK_SYSROOT}" - -DCMAKE_SYSTEM_NAME=Generic - -DCMAKE_SYSTEM_PROCESSOR="$(echo "${TARGET}" | cut -d - -f1)" - -DCMAKE_VERBOSE_MAKEFILE=On -"${COOKBOOK_SOURCE}" -) -cookbook_configure -""" +template = "cmake" diff --git a/recipes/wip/libs/other/libgdal/recipe.toml b/recipes/wip/libs/other/libgdal/recipe.toml index 56944b4c..ef303c13 100644 --- a/recipes/wip/libs/other/libgdal/recipe.toml +++ b/recipes/wip/libs/other/libgdal/recipe.toml @@ -1,20 +1,6 @@ -#TODO maybe incomplete script, see https://gdal.org/development/building_from_source.html +#TODO not compiled or tested +# build instructions: https://gdal.org/development/building_from_source.html [source] tar = "https://github.com/OSGeo/gdal/releases/download/v3.8.4/gdal-3.8.4.tar.gz" [build] -template = "custom" -script = """ -COOKBOOK_CONFIGURE="cmake" -COOKBOOK_CONFIGURE_FLAGS=( - -DCMAKE_BUILD_TYPE=Release - -DCMAKE_CROSSCOMPILING=True - -DCMAKE_EXE_LINKER_FLAGS="-static" - -DCMAKE_INSTALL_PREFIX="/" - -DCMAKE_PREFIX_PATH="${COOKBOOK_SYSROOT}" - -DCMAKE_SYSTEM_NAME=Generic - -DCMAKE_SYSTEM_PROCESSOR="$(echo "${TARGET}" | cut -d - -f1)" - -DCMAKE_VERBOSE_MAKEFILE=On -"${COOKBOOK_SOURCE}" -) -cookbook_configure -""" +template = "cmake" diff --git a/recipes/wip/libs/other/libgit2/recipe.toml b/recipes/wip/libs/other/libgit2/recipe.toml index 8b398019..f08d3e9a 100644 --- a/recipes/wip/libs/other/libgit2/recipe.toml +++ b/recipes/wip/libs/other/libgit2/recipe.toml @@ -1,24 +1,10 @@ -#TODO maybe wrong script, see https://github.com/libgit2/libgit2#building-libgit2---using-cmake +#TODO not compiled or tested +# build instructions: https://github.com/libgit2/libgit2#building-libgit2---using-cmake [source] git = "https://github.com/libgit2/libgit2" rev = "a2bde63741977ca0f4ef7db2f609df320be67a08" [build] -template = "custom" +template = "cmake" dependencies = [ "openssl1", ] -script = """ - COOKBOOK_CONFIGURE="cmake" - COOKBOOK_CONFIGURE_FLAGS=( - -DCMAKE_BUILD_TYPE=Release - -DCMAKE_CROSSCOMPILING=True - -DCMAKE_EXE_LINKER_FLAGS="-static" - -DCMAKE_INSTALL_PREFIX="/" - -DCMAKE_PREFIX_PATH="${COOKBOOK_SYSROOT}" - -DCMAKE_SYSTEM_NAME=Generic - -DCMAKE_SYSTEM_PROCESSOR="$(echo "${TARGET}" | cut -d - -f1)" - -DCMAKE_VERBOSE_MAKEFILE=On -"${COOKBOOK_SOURCE}" -) -cookbook_configure -""" diff --git a/recipes/wip/libs/other/libgrantlee/recipe.toml b/recipes/wip/libs/other/libgrantlee/recipe.toml index 9e8d4f79..544697ad 100644 --- a/recipes/wip/libs/other/libgrantlee/recipe.toml +++ b/recipes/wip/libs/other/libgrantlee/recipe.toml @@ -1,23 +1,9 @@ -#TODO maybe incomplete script, see https://github.com/steveire/grantlee#installation +#TODO not compiled or tested +# build instructions: https://github.com/steveire/grantlee#installation [source] tar = "https://github.com/steveire/grantlee/releases/download/v5.3.1/grantlee-5.3.1.tar.gz" [build] -template = "custom" +template = "cmake" dependencies = [ "qt5-base", ] -script = """ -COOKBOOK_CONFIGURE="cmake" -COOKBOOK_CONFIGURE_FLAGS=( - -DCMAKE_BUILD_TYPE=Release - -DCMAKE_CROSSCOMPILING=True - -DCMAKE_EXE_LINKER_FLAGS="-static" - -DCMAKE_INSTALL_PREFIX="/" - -DCMAKE_PREFIX_PATH="${COOKBOOK_SYSROOT}" - -DCMAKE_SYSTEM_NAME=Generic - -DCMAKE_SYSTEM_PROCESSOR="$(echo "${TARGET}" | cut -d - -f1)" - -DCMAKE_VERBOSE_MAKEFILE=On -"${COOKBOOK_SOURCE}" -) -cookbook_configure -""" diff --git a/recipes/wip/libs/other/libhidapi/recipe.toml b/recipes/wip/libs/other/libhidapi/recipe.toml index df68a63d..bc5e83c4 100644 --- a/recipes/wip/libs/other/libhidapi/recipe.toml +++ b/recipes/wip/libs/other/libhidapi/recipe.toml @@ -1,24 +1,10 @@ -#TODO maybe incomplete script, see https://github.com/libusb/hidapi/blob/master/BUILD.cmake.md +#TODO not compiled or tested +# build instructions: https://github.com/libusb/hidapi/blob/master/BUILD.cmake.md [source] git = "https://github.com/libusb/hidapi" rev = "d3013f0af3f4029d82872c1a9487ea461a56dee4" [build] -template = "custom" +template = "cmake" dependencies = [ "libiconv", ] -script = """ -COOKBOOK_CONFIGURE="cmake" -COOKBOOK_CONFIGURE_FLAGS=( - -DCMAKE_BUILD_TYPE=Release - -DCMAKE_CROSSCOMPILING=True - -DCMAKE_EXE_LINKER_FLAGS="-static" - -DCMAKE_INSTALL_PREFIX="/" - -DCMAKE_PREFIX_PATH="${COOKBOOK_SYSROOT}" - -DCMAKE_SYSTEM_NAME=Generic - -DCMAKE_SYSTEM_PROCESSOR="$(echo "${TARGET}" | cut -d - -f1)" - -DCMAKE_VERBOSE_MAKEFILE=On -"${COOKBOOK_SOURCE}" -) -cookbook_configure -"""