From d99aef95ce1e0676b25e49f415822411ebc361ec Mon Sep 17 00:00:00 2001 From: bjorn3 <17426603+bjorn3@users.noreply.github.com> Date: Sat, 28 Jun 2025 21:50:55 +0200 Subject: [PATCH] Use a recipe.toml file for osdemo --- recipes/demos/osdemo/recipe.sh | 32 -------------------------------- recipes/demos/osdemo/recipe.toml | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 32 deletions(-) delete mode 100644 recipes/demos/osdemo/recipe.sh create mode 100644 recipes/demos/osdemo/recipe.toml diff --git a/recipes/demos/osdemo/recipe.sh b/recipes/demos/osdemo/recipe.sh deleted file mode 100644 index c222548f7..000000000 --- a/recipes/demos/osdemo/recipe.sh +++ /dev/null @@ -1,32 +0,0 @@ -BUILD_DEPENDS=(liborbital llvm18 mesa mesa-glu zlib) - -function recipe_version { - printf "1.0.0" - skip=1 -} - -function recipe_prepare { - rm -rf source - mkdir source - cp osdemo.c source -} - -function recipe_build { - sysroot="$(realpath ../sysroot)" - set -x - "${CXX}" -O2 -I "$sysroot/include" -L "$sysroot/lib" osdemo.c -o osdemo -static -lorbital $("${PKG_CONFIG}" --libs glu) -lz - set +x - skip=1 -} - -function recipe_clean { - "$REDOX_MAKE" clean - skip=1 -} - -function recipe_stage { - dest="$(realpath $1)" - mkdir -pv "$dest/bin" - cp -v "osdemo" "$dest/bin/osdemo" - skip=1 -} diff --git a/recipes/demos/osdemo/recipe.toml b/recipes/demos/osdemo/recipe.toml new file mode 100644 index 000000000..f400a6f30 --- /dev/null +++ b/recipes/demos/osdemo/recipe.toml @@ -0,0 +1,15 @@ +[build] +template = "custom" +dependencies = [ + "liborbital", + "llvm18", + "mesa", + "mesa-glu", + "zlib" +] +script = """ +cp "${COOKBOOK_SOURCE}/../osdemo.c" ./osdemo.c +"${CXX}" -O2 -I "${COOKBOOK_SYSROOT}/include" -L "${COOKBOOK_SYSROOT}/lib" osdemo.c -o osdemo -static -lorbital $("${PKG_CONFIG}" --libs glu) -lz +mkdir -pv "${COOKBOOK_STAGE}/usr/bin" +cp -v "osdemo" "${COOKBOOK_STAGE}/usr/bin/osdemo" +"""