From 352c912ce9b01d28367fdcecb65212952c433a76 Mon Sep 17 00:00:00 2001 From: Ribbon Date: Wed, 8 Oct 2025 14:30:46 -0300 Subject: [PATCH] Try to fix more CMake-based recipes --- recipes/wip/libs/image/libwebp2/recipe.toml | 20 ++----------- recipes/wip/libs/ml/libtorch/recipe.toml | 28 +++++-------------- .../wip/libs/other/bullet-physics/recipe.toml | 5 ++-- recipes/wip/libs/other/dcmtk/recipe.toml | 20 ++----------- recipes/wip/libs/other/freealut/recipe.toml | 20 ++----------- recipes/wip/libs/other/freeglut/recipe.toml | 12 +++----- recipes/wip/libs/other/gflags/recipe.toml | 20 ++----------- recipes/wip/libs/other/glfw3/recipe.toml | 21 ++------------ recipes/wip/libs/other/json-c/recipe.toml | 20 ++----------- recipes/wip/libs/other/lammps/recipe.toml | 20 ++----------- recipes/wip/libs/other/lib2geom/recipe.toml | 20 ++----------- recipes/wip/libs/other/libaom/recipe.toml | 20 ++----------- 12 files changed, 41 insertions(+), 185 deletions(-) diff --git a/recipes/wip/libs/image/libwebp2/recipe.toml b/recipes/wip/libs/image/libwebp2/recipe.toml index 1f7fa851a..2bc5b9aef 100644 --- a/recipes/wip/libs/image/libwebp2/recipe.toml +++ b/recipes/wip/libs/image/libwebp2/recipe.toml @@ -1,20 +1,6 @@ -#TODO maybe incomplete script, see https://chromium.googlesource.com/codecs/libwebp2/#compiling +#TODO not compiled or tested +# build instructions: https://chromium.googlesource.com/codecs/libwebp2/#compiling [source] git = "https://chromium.googlesource.com/codecs/libwebp2" [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/ml/libtorch/recipe.toml b/recipes/wip/libs/ml/libtorch/recipe.toml index eceb2687d..535bfaee1 100644 --- a/recipes/wip/libs/ml/libtorch/recipe.toml +++ b/recipes/wip/libs/ml/libtorch/recipe.toml @@ -1,25 +1,11 @@ -#TODO maybe incomplete script, see https://github.com/pytorch/pytorch/blob/main/docs/libtorch.rst#building-libtorch-using-cmake +#TODO not compiled or tested +# build instructions: https://github.com/pytorch/pytorch/blob/main/docs/libtorch.rst#building-libtorch-using-cmake [source] git = "https://github.com/pytorch/pytorch" branch = "release/2.3" [build] -template = "custom" -script = """ -mkdir pytorch-build -cd pytorch-build -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 - -DBUILD_SHARED_LIBS:BOOL=OFF - -DCMAKE_BUILD_TYPE:STRING=Release -DPYTHON_EXECUTABLE:PATH=`which python3` -DCMAKE_INSTALL_PREFIX:PATH=../pytorch-install ../pytorch -"${COOKBOOK_SOURCE}" -) -cookbook_configure -""" +template = "cmake" +cmakeflags = [ + "-DPYTHON_EXECUTABLE=`which python3`", + "-DCMAKE_INSTALL_PREFIX=../pytorch-install ../pytorch", +] diff --git a/recipes/wip/libs/other/bullet-physics/recipe.toml b/recipes/wip/libs/other/bullet-physics/recipe.toml index 3fe74819d..9ebbf9300 100644 --- a/recipes/wip/libs/other/bullet-physics/recipe.toml +++ b/recipes/wip/libs/other/bullet-physics/recipe.toml @@ -1,6 +1,7 @@ -#TODO missing script for Premake or CMake, see https://github.com/bulletphysics/bullet3#build-instructions-for-bullet-using-premake-you-can-also-use-cmake-instead +#TODO not compiled or tested +# build instructions: https://github.com/bulletphysics/bullet3#build-instructions-for-bullet-using-premake-you-can-also-use-cmake-instead [source] git = "https://github.com/bulletphysics/bullet3" rev = "2c204c49e56ed15ec5fcfa71d199ab6d6570b3f5" [build] -template = "custom" +template = "cmake" diff --git a/recipes/wip/libs/other/dcmtk/recipe.toml b/recipes/wip/libs/other/dcmtk/recipe.toml index 158ebe943..5ab1bfe9e 100644 --- a/recipes/wip/libs/other/dcmtk/recipe.toml +++ b/recipes/wip/libs/other/dcmtk/recipe.toml @@ -1,8 +1,9 @@ -#TODO maybe incomplete script, see https://git.dcmtk.org/?p=dcmtk.git;a=blob;f=INSTALL;h=97087f9a05e65040264d90027912c736958e67f3;hb=HEAD#l667 +#TODO not compiled or tested +# build instructions: https://git.dcmtk.org/?p=dcmtk.git;a=blob;f=INSTALL;h=97087f9a05e65040264d90027912c736958e67f3;hb=HEAD#l667 [source] tar = "https://dicom.offis.de/download/dcmtk/dcmtk367/dcmtk-3.6.7.tar.gz" [build] -template = "custom" +template = "cmake" dependencies = [ "libiconv", "libicu", @@ -12,18 +13,3 @@ dependencies = [ "zlib", "openjpeg", ] -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/freealut/recipe.toml b/recipes/wip/libs/other/freealut/recipe.toml index a774784aa..a8f6b267c 100644 --- a/recipes/wip/libs/other/freealut/recipe.toml +++ b/recipes/wip/libs/other/freealut/recipe.toml @@ -1,20 +1,6 @@ -#TODO probably wrong script, see https://github.com/vancegroup/freealut#building-freealut +#TODO not compiled or tested +# build instructions: https://github.com/vancegroup/freealut#building-freealut [source] git = "https://github.com/vancegroup/freealut" [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/freeglut/recipe.toml b/recipes/wip/libs/other/freeglut/recipe.toml index dbb525b95..159d39b01 100644 --- a/recipes/wip/libs/other/freeglut/recipe.toml +++ b/recipes/wip/libs/other/freeglut/recipe.toml @@ -1,4 +1,4 @@ -#TODO port to Orbital +#TODO not compiled or tested [source] tar = "https://github.com/freeglut/freeglut/releases/download/v3.4.0/freeglut-3.4.0.tar.gz" #blake3 = "08c8874d6ddad5be4860813865d4d4e2a84c294da0f3cf82a29e43920806b0da" @@ -9,6 +9,7 @@ dependencies = [ ] template = "custom" script = """ +DYNAMIC_INIT cat > redox.cmake <