diff --git a/mk/prefix.mk b/mk/prefix.mk index c287999c..625cbcf8 100644 --- a/mk/prefix.mk +++ b/mk/prefix.mk @@ -124,21 +124,22 @@ endif else # BUILD GCC --------------------------------------------------- -$(PREFIX)/binutils-install: | $(FSTOOLS_TAG) $(CONTAINER_TAG) +$(PREFIX)/binutils-install: | $(PREFIX)/libtool-install $(FSTOOLS_TAG) $(CONTAINER_TAG) ifeq ($(PODMAN_BUILD),1) $(PODMAN_RUN) make $@ else @echo "\033[1;36;49mBuilding binutils-install\033[0m" rm -rf "$@.partial" "$@" mkdir -p "$@.partial" - export $(PREFIX_CONFIG) COOKBOOK_HOST_SYSROOT=/usr COOKBOOK_CROSS_TARGET=$(TARGET) COOKBOOK_CROSS_GNU_TARGET=$(GNU_TARGET) && \ + export $(PREFIX_CONFIG) PATH="$(ROOT)/$(PREFIX)/libtool-install/bin:$$PATH" \ + COOKBOOK_HOST_SYSROOT=/usr COOKBOOK_CROSS_TARGET=$(TARGET) COOKBOOK_CROSS_GNU_TARGET=$(GNU_TARGET) && \ ./target/release/repo cook host:binutils-gdb cp -r "$(BINUTILS_TARGET)/stage/usr/". "$@.partial" touch "$@.partial" mv "$@.partial" "$@" endif -$(PREFIX)/gcc-freestanding-install: $(PREFIX)/libtool-install $(PREFIX)/binutils-install | $(FSTOOLS_TAG) $(CONTAINER_TAG) +$(PREFIX)/gcc-freestanding-install: $(PREFIX)/binutils-install | $(PREFIX)/libtool-install $(FSTOOLS_TAG) $(CONTAINER_TAG) ifeq ($(PODMAN_BUILD),1) $(PODMAN_RUN) make $@ else diff --git a/podman/redox-base-containerfile b/podman/redox-base-containerfile index 8366fa68..e12c485c 100644 --- a/podman/redox-base-containerfile +++ b/podman/redox-base-containerfile @@ -40,11 +40,8 @@ RUN apt-get update \ libfuse3-dev \ libgdk-pixbuf2.0-bin \ libglib2.0-dev-bin \ - libgmp-dev \ libhtml-parser-perl \ libjpeg-dev \ - libmpc-dev \ - libmpfr-dev \ libparse-yapp-perl \ libpng-dev \ librsvg2-common \ diff --git a/recipes/dev/binutils-gdb/recipe.toml b/recipes/dev/binutils-gdb/recipe.toml index 33f3b882..42522086 100644 --- a/recipes/dev/binutils-gdb/recipe.toml +++ b/recipes/dev/binutils-gdb/recipe.toml @@ -1,12 +1,13 @@ [source] git = "https://gitlab.redox-os.org/redox-os/binutils-gdb" branch = "redox-2.43.1" +shallow_clone = true [build] template = "custom" dependencies = [ -# "libgmp", -# "libmpfr", + "libgmp", + "libmpfr", # TODO: this zlib get linked when boostrapping binutils # "zlib" ] diff --git a/recipes/libs/libgmp/recipe.toml b/recipes/libs/libgmp/recipe.toml index 8645c561..180f42fc 100644 --- a/recipes/libs/libgmp/recipe.toml +++ b/recipes/libs/libgmp/recipe.toml @@ -5,13 +5,10 @@ [source] tar = "https://ftp.gnu.org/gnu/gmp/gmp-6.3.0.tar.xz" blake3 = "fffe4996713928ae19331c8ef39129e46d3bf5b7182820656fd4639435cd83a4" -script = """ -autotools_recursive_regenerate -""" [build] template = "custom" script = """ -DYNAMIC_INIT +DYNAMIC_STATIC_INIT cookbook_configure """ \ No newline at end of file diff --git a/recipes/libs/libmpfr/recipe.toml b/recipes/libs/libmpfr/recipe.toml index 468025f9..879e2e79 100644 --- a/recipes/libs/libmpfr/recipe.toml +++ b/recipes/libs/libmpfr/recipe.toml @@ -11,6 +11,6 @@ dependencies = [ "libgmp", ] script = """ -DYNAMIC_INIT +DYNAMIC_STATIC_INIT cookbook_configure """ \ No newline at end of file diff --git a/recipes/libs/mpc/recipe.toml b/recipes/libs/mpc/recipe.toml index 075a66e0..70818e50 100644 --- a/recipes/libs/mpc/recipe.toml +++ b/recipes/libs/mpc/recipe.toml @@ -14,6 +14,6 @@ dependencies = [ "libmpfr", ] script = """ -DYNAMIC_INIT +DYNAMIC_STATIC_INIT cookbook_configure """ \ No newline at end of file