diff --git a/config/aarch64/ci.toml b/config/aarch64/ci.toml index 38f1f1c7c..bbe0b3376 100644 --- a/config/aarch64/ci.toml +++ b/config/aarch64/ci.toml @@ -7,6 +7,7 @@ prompt = false # Package settings [packages] +acid = {} base = {} base-initfs = {} bash = {} diff --git a/config/i586/ci.toml b/config/i586/ci.toml index 25837e431..1df1e25d3 100644 --- a/config/i586/ci.toml +++ b/config/i586/ci.toml @@ -7,6 +7,7 @@ prompt = false # Package settings [packages] +acid = {} base = {} base-initfs = {} bash = {} diff --git a/config/riscv64gc/ci.toml b/config/riscv64gc/ci.toml index ae65380d7..694fbafa4 100644 --- a/config/riscv64gc/ci.toml +++ b/config/riscv64gc/ci.toml @@ -7,6 +7,7 @@ prompt = false # Package settings [packages] +acid = {} base = {} base-initfs = {} bash = {} diff --git a/config/x86_64/ci.toml b/config/x86_64/ci.toml index 393077f61..be544cc7e 100644 --- a/config/x86_64/ci.toml +++ b/config/x86_64/ci.toml @@ -13,8 +13,8 @@ prompt = false dev-essential = {} dev-redox = {} redox-tests = {} -#x11-minimal = { # needs all dependencies added below -#x11-full = {} # needs all dependencies added below +x11-minimal = {} +x11-full = {} # Normal packages below @@ -72,7 +72,7 @@ fribidi = {} #gawk = {} # langinfo.h gcc13 = {} gdbserver = {} -#gdk-pixbuf = {} # shared-mime-info +gdk-pixbuf = {} gears = {} generaluser-gs = {} gettext = {} @@ -168,7 +168,7 @@ pcre = {} perg = {} periodictable = {} php84 = {} -#perl5 = {} # ctermid, tempnam, ttyname +perl5 = {} pixelcannon = {} #pixman = {} # depends on glib which does not build #pkgar = {} # uses virtual Cargo.toml, needs recipe update @@ -213,7 +213,7 @@ sdl2-image = {} sdl2-mixer = {} sdl2-ttf = {} sed = {} -#servo = {} # some more crates to port +servo = {} shared-mime-info = {} shellharden = {} shellstorm = {} @@ -223,7 +223,7 @@ sodium = {} sopwith = {} sqlite3 = {} strace = {} -#syobonaction = {} # linking errors +syobonaction = {} terminfo = {} #termplay = {} # backtrace cannot find link.h timidity = {} @@ -235,6 +235,7 @@ uutils = {} vim = {} vttest = {} #vvvvvv = {} # did not compile +webkitgtk3 = {} #webrender = {} # unwind #wesnoth = {} winit = {} diff --git a/recipes/dev/autoconf/recipe.toml b/recipes/dev/autoconf/recipe.toml index a4f8df2f8..83cc9c4f5 100644 --- a/recipes/dev/autoconf/recipe.toml +++ b/recipes/dev/autoconf/recipe.toml @@ -4,3 +4,6 @@ blake3 = "da1cc8af8551c343de9f42af0ae53fd7dff3623487157623892b6cd7e3bb5692" [build] template = "configure" + +[package] +dependencies = ["perl5"] diff --git a/recipes/dev/automake/recipe.toml b/recipes/dev/automake/recipe.toml index c733beb95..327eecad3 100644 --- a/recipes/dev/automake/recipe.toml +++ b/recipes/dev/automake/recipe.toml @@ -4,3 +4,6 @@ blake3 = "f42cfc333aaaa11f2bcb05b5b0273b8706c820c22f9ba4367f7eb920551695cd" [build] template = "configure" + +[package] +dependencies = ["perl5"] diff --git a/recipes/dev/luajit/recipe.toml b/recipes/dev/luajit/recipe.toml index b8d7bf51e..b6d86974e 100644 --- a/recipes/dev/luajit/recipe.toml +++ b/recipes/dev/luajit/recipe.toml @@ -7,10 +7,16 @@ template = "custom" script = """ DYNAMIC_INIT -rsync -av --delete "${COOKBOOK_SOURCE}/" ./ +rsync -av "${COOKBOOK_SOURCE}/" ./ +OS=$(echo "${TARGET}" | cut -d - -f3) + +case "${OS}" in + linux) SYS=Linux;; + redox) SYS=Redox;; +esac ${COOKBOOK_MAKE} -j ${COOKBOOK_MAKE_JOBS} install \ PREFIX="${COOKBOOK_STAGE}" \ - TARGET_SYS='Redox' \ - CROSS="${TARGET}-" + TARGET_SYS="${SYS}" \ + CROSS="${GNU_TARGET}-" """ diff --git a/recipes/wip/dev/lang/perl5/recipe.toml b/recipes/wip/dev/lang/perl5/recipe.toml index ab8b3e604..9c2f8568e 100644 --- a/recipes/wip/dev/lang/perl5/recipe.toml +++ b/recipes/wip/dev/lang/perl5/recipe.toml @@ -4,24 +4,24 @@ #TODO needs further testing [source] tar = "https://www.cpan.org/src/5.0/perl-5.40.0.tar.gz" -[build] -template = "custom" -dependencies = [ - "relibc" -] +blake3 = "8bfcbb999e0795a64ca90e1ba7308f49c30ab2619ffa25fa425527c4bfca5e0f" script = """ -rsync -av --delete "${COOKBOOK_SOURCE}/" ./ #move it to the top of the script after debugging - BP curl -L -O --time-cond perl-cross-1.6.tar.gz https://github.com/arsv/perl-cross/releases/download/1.6/perl-cross-1.6.tar.gz tar --strip-components=1 -xvf perl-cross-1.6.tar.gz -wget -O ./cnf/config.sub "https://gitlab.redox-os.org/redox-os/gnu-config/-/raw/master/config.sub?inline=false" +GNU_CONFIG_GET ./cnf/config.sub +""" +[build] +template = "custom" +dev-dependencies = ["relibc"] +script = """ +DYNAMIC_INIT +rsync -av --delete "${COOKBOOK_SOURCE}/" ./ + #Note: since perl-cross can run only inside the source-tree (out-of-tree is bugged) it's easier to do everything in the build directory -COOKBOOK_CONFIGURE=${COOKBOOK_BUILD}/configure cp ${COOKBOOK_RECIPE}/configure_tool.sh ${COOKBOOK_BUILD}/cnf/configure_tool.sh cp ${COOKBOOK_RECIPE}/redox ${COOKBOOK_BUILD}/cnf/hints/redox -mkdir ${COOKBOOK_SYSROOT}/usr -ln -s "${COOKBOOK_SYSROOT}/include" "${COOKBOOK_SYSROOT}/usr/include" #Note: non-standard configure, familiar flags can have different meaning! -./configure --host-cc=gcc --host-cpp=g++ --target=x86_64-unknown-redox --sysroot=${COOKBOOK_SYSROOT} --disable-mod=Sys-Syslog +./configure --host-cc="gcc" --host-cpp="g++" --target=${TARGET} --sysroot=${COOKBOOK_SYSROOT} sed -i "s/^#define Netdb_name_t.*/#define Netdb_name_t const char*/" config.h sed -i "s/^# HAS_NANOSLEEP.*/#define HAS_NANOSLEEP/" config.h sed -i "s|^/.#define I_GRP.*|#define I_GRP|" config.h