From 76ad7ed87d763ea663a099dd18e34a3b1f217c99 Mon Sep 17 00:00:00 2001 From: Ribbon <ribbon_45@proton.me> Date: Thu, 4 Jan 2024 01:26:51 +0000 Subject: [PATCH] update recipes --- recipes/wip/cava/recipe.toml | 6 +++++- recipes/wip/clamav/recipe.toml | 1 + recipes/wip/cmus/recipe.toml | 6 +++++- recipes/wip/conky/recipe.toml | 1 + recipes/wip/dcss/recipe.toml | 3 +++ recipes/wip/emacs-nox/recipe.toml | 6 +++++- recipes/wip/emacs-pgtk/recipe.toml | 6 +++++- recipes/wip/fish-shell/recipe.toml | 1 + recipes/wip/hickory-dns/recipe.toml | 10 +++++----- recipes/wip/libedit/recipe.toml | 8 ++++++-- recipes/wip/lynx/recipe.toml | 8 ++++++-- recipes/wip/mariadb/recipe.toml | 1 + recipes/wip/mosh/recipe.toml | 8 ++++++-- recipes/wip/ncspot/recipe.toml | 1 + 14 files changed, 51 insertions(+), 15 deletions(-) diff --git a/recipes/wip/cava/recipe.toml b/recipes/wip/cava/recipe.toml index ba6f0581c..ec0f1555c 100644 --- a/recipes/wip/cava/recipe.toml +++ b/recipes/wip/cava/recipe.toml @@ -3,8 +3,12 @@ git = "https://github.com/karlstav/cava" rev = "81211e9e16302312ee4322a99840c110bce0e13d" [build] -template = "configure" +template = "custom" dependencies = [ "ncurses", "fftw", ] +script = """ +export CPPFLAGS="-I${COOKBOOK_SYSROOT}/include/ncurses" +cookbook_configure +""" diff --git a/recipes/wip/clamav/recipe.toml b/recipes/wip/clamav/recipe.toml index 82aed1b6a..23435660c 100644 --- a/recipes/wip/clamav/recipe.toml +++ b/recipes/wip/clamav/recipe.toml @@ -15,6 +15,7 @@ dependencies = [ "zlib", ] script = """ +export CPPFLAGS="-I${COOKBOOK_SYSROOT}/include/ncurses" COOKBOOK_CONFIGURE="cmake" COOKBOOK_CONFIGURE_FLAGS=( -DCMAKE_BUILD_TYPE=Release diff --git a/recipes/wip/cmus/recipe.toml b/recipes/wip/cmus/recipe.toml index f93716f29..b6c63760b 100644 --- a/recipes/wip/cmus/recipe.toml +++ b/recipes/wip/cmus/recipe.toml @@ -3,7 +3,11 @@ git = "https://github.com/cmus/cmus" rev = "ade6e2a7253d7a256e87fdac3da17c9158e6700e" [build] -template = "configure" +template = "custom" dependencies = [ "ncurses", ] +script = """ +export CPPFLAGS="-I${COOKBOOK_SYSROOT}/include/ncurses" +cookbook_configure +""" diff --git a/recipes/wip/conky/recipe.toml b/recipes/wip/conky/recipe.toml index a9d69bef7..ca3945b36 100644 --- a/recipes/wip/conky/recipe.toml +++ b/recipes/wip/conky/recipe.toml @@ -11,6 +11,7 @@ dependencies = [ "curl", ] script = """ +export CPPFLAGS="-I${COOKBOOK_SYSROOT}/include/ncurses" COOKBOOK_CONFIGURE="cmake" COOKBOOK_CONFIGURE_FLAGS=( -DCMAKE_BUILD_TYPE=Release diff --git a/recipes/wip/dcss/recipe.toml b/recipes/wip/dcss/recipe.toml index 4d38be391..29895a7de 100644 --- a/recipes/wip/dcss/recipe.toml +++ b/recipes/wip/dcss/recipe.toml @@ -13,3 +13,6 @@ dependencies = [ "zlib", "libpng", ] +script = """ +export CPPFLAGS="-I${COOKBOOK_SYSROOT}/include/ncurses" +""" diff --git a/recipes/wip/emacs-nox/recipe.toml b/recipes/wip/emacs-nox/recipe.toml index 481a50657..c6b9117af 100644 --- a/recipes/wip/emacs-nox/recipe.toml +++ b/recipes/wip/emacs-nox/recipe.toml @@ -3,7 +3,7 @@ [source] tar = "https://ftp.gnu.org/gnu/emacs/emacs-29.1.tar.xz" [build] -template = "configure" +template = "custom" dependencies = [ "dbus", "libgmp", @@ -16,3 +16,7 @@ dependencies = [ "zlib", "ncurses", ] +script = """ +export CPPFLAGS="-I${COOKBOOK_SYSROOT}/include/ncurses" +cookbook_configure +""" diff --git a/recipes/wip/emacs-pgtk/recipe.toml b/recipes/wip/emacs-pgtk/recipe.toml index 976707765..e72ad0d06 100644 --- a/recipes/wip/emacs-pgtk/recipe.toml +++ b/recipes/wip/emacs-pgtk/recipe.toml @@ -3,7 +3,7 @@ [source] tar = "https://ftp.gnu.org/gnu/emacs/emacs-29.1.tar.xz" [build] -template = "configure" +template = "custom" dependencies = [ "dbus", "libgmp", @@ -31,3 +31,7 @@ dependencies = [ "libwebp", "libotf", ] +script = """ +export CPPFLAGS="-I${COOKBOOK_SYSROOT}/include/ncurses" +cookbook_configure +""" diff --git a/recipes/wip/fish-shell/recipe.toml b/recipes/wip/fish-shell/recipe.toml index 626f51b5c..8ac57d389 100644 --- a/recipes/wip/fish-shell/recipe.toml +++ b/recipes/wip/fish-shell/recipe.toml @@ -9,6 +9,7 @@ dependencies = [ "pcre", ] script = """ +export CPPFLAGS="-I${COOKBOOK_SYSROOT}/include/ncurses" COOKBOOK_CONFIGURE="cmake" COOKBOOK_CONFIGURE_FLAGS=( -DCMAKE_BUILD_TYPE=Release diff --git a/recipes/wip/hickory-dns/recipe.toml b/recipes/wip/hickory-dns/recipe.toml index 8d9e8b5cc..5d3bb1a0f 100644 --- a/recipes/wip/hickory-dns/recipe.toml +++ b/recipes/wip/hickory-dns/recipe.toml @@ -1,4 +1,4 @@ -#TODO wrong script +#TODO compiled but not tested [source] git = "https://github.com/hickory-dns/hickory-dns" rev = "408d0baca080d1b201cd33e616dc4abd160ef6c0" @@ -8,14 +8,14 @@ dependencies = [ "openssl1", ] script = """ -package=hickory-dns" +binary=hickory-dns "${COOKBOOK_CARGO}" build \ --manifest-path "${COOKBOOK_SOURCE}/Cargo.toml" \ - --package "${package}" \ + --bin "${binary}" \ --release --all-features mkdir -pv "${COOKBOOK_STAGE}/bin" cp -v \ - "target/${TARGET}/release/${package}" \ - "${COOKBOOK_STAGE}/bin/${package}" + "target/${TARGET}/release/${binary}" \ + "${COOKBOOK_STAGE}/bin/${binary}" """ diff --git a/recipes/wip/libedit/recipe.toml b/recipes/wip/libedit/recipe.toml index 367f46b6a..c00a8c38c 100644 --- a/recipes/wip/libedit/recipe.toml +++ b/recipes/wip/libedit/recipe.toml @@ -2,9 +2,13 @@ [source] tar = "https://www.thrysoee.dk/editline/libedit-20221030-3.1.tar.gz" [build] -template = "configure" +template = "custom" dependencies = [ "ncurses", "termcap", "terminfo", -] \ No newline at end of file +] +script = """ +export CPPFLAGS="-I${COOKBOOK_SYSROOT}/include/ncurses" +cookbook_configure +""" diff --git a/recipes/wip/lynx/recipe.toml b/recipes/wip/lynx/recipe.toml index bd5f54891..1ac40e8d6 100644 --- a/recipes/wip/lynx/recipe.toml +++ b/recipes/wip/lynx/recipe.toml @@ -1,8 +1,12 @@ -#TODO compilation error +#TODO not compiled or tested [source] tar = "https://invisible-island.net/archives/lynx/tarballs/lynx2.8.9rel.1.tar.gz" [build] -template = "configure" +template = "custom" dependencies = [ "ncurses", ] +script = """ +export CPPFLAGS="-I${COOKBOOK_SYSROOT}/include/ncurses" +cookbook_configure +""" diff --git a/recipes/wip/mariadb/recipe.toml b/recipes/wip/mariadb/recipe.toml index 2d5b862b9..4b8d6556d 100644 --- a/recipes/wip/mariadb/recipe.toml +++ b/recipes/wip/mariadb/recipe.toml @@ -16,6 +16,7 @@ dependencies = [ "libaio", ] script = """ +export CPPFLAGS="-I${COOKBOOK_SYSROOT}/include/ncurses" COOKBOOK_CONFIGURE="cmake" COOKBOOK_CONFIGURE_FLAGS=( -DCMAKE_BUILD_TYPE=Release diff --git a/recipes/wip/mosh/recipe.toml b/recipes/wip/mosh/recipe.toml index 03d120ace..d2eb5a40d 100644 --- a/recipes/wip/mosh/recipe.toml +++ b/recipes/wip/mosh/recipe.toml @@ -1,10 +1,14 @@ -#TODO missing headers +#TODO not compiled or tested [source] tar = "https://mosh.org/mosh-1.4.0.tar.gz" [build] -template = "configure" +template = "custom" dependencies = [ "openssl1", "ncurses", "zlib", ] +script = """ +export CPPFLAGS="-I${COOKBOOK_SYSROOT}/include/ncurses" +cookbook_configure +""" diff --git a/recipes/wip/ncspot/recipe.toml b/recipes/wip/ncspot/recipe.toml index 37e72505d..4af546db0 100644 --- a/recipes/wip/ncspot/recipe.toml +++ b/recipes/wip/ncspot/recipe.toml @@ -9,5 +9,6 @@ dependencies = [ "ncurses", ] script = """ +export CPPFLAGS="-I${COOKBOOK_SYSROOT}/include/ncurses" cookbook_cargo --features rodio_backend,pancurses_backend """ -- GitLab