MahnoKropotkinvich/redox
1
0
Fork 0
mirror of https://gitlab.redox-os.org/redox-os/redox.git synced 2026-11-05 04:06:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use GCC static libs, remove them from podman

Browse Source
This commit is contained in:
Wildan M 2026-02-08 08:49:12 +07:00
parent afc40ec53f
commit 59bf03630f
No known key found for this signature in database
GPG Key ID: 01AC53185C679C79
6 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mk/prefix.mk
View File

@ -124,21 +124,22 @@ endif
else else
# BUILD GCC --------------------------------------------------- # BUILD GCC ---------------------------------------------------
$(PREFIX)/binutils-install: | $(FSTOOLS_TAG) $(CONTAINER_TAG) $(PREFIX)/binutils-install: | $(PREFIX)/libtool-install $(FSTOOLS_TAG) $(CONTAINER_TAG)
ifeq ($(PODMAN_BUILD),1) ifeq ($(PODMAN_BUILD),1)
$(PODMAN_RUN) make $@ $(PODMAN_RUN) make $@
else else
@echo "\033[1;36;49mBuilding binutils-install\033[0m" @echo "\033[1;36;49mBuilding binutils-install\033[0m"
rm -rf "$@.partial" "$@" rm -rf "$@.partial" "$@"
mkdir -p "$@.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 ./target/release/repo cook host:binutils-gdb
cp -r "$(BINUTILS_TARGET)/stage/usr/". "$@.partial" cp -r "$(BINUTILS_TARGET)/stage/usr/". "$@.partial"
touch "$@.partial" touch "$@.partial"
mv "$@.partial" "$@" mv "$@.partial" "$@"
endif 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) ifeq ($(PODMAN_BUILD),1)
$(PODMAN_RUN) make $@ $(PODMAN_RUN) make $@
else else

3
podman/redox-base-containerfile
View File

@ -40,11 +40,8 @@ RUN apt-get update \
libfuse3-dev \ libfuse3-dev \
libgdk-pixbuf2.0-bin \ libgdk-pixbuf2.0-bin \
libglib2.0-dev-bin \ libglib2.0-dev-bin \
libgmp-dev \
libhtml-parser-perl \ libhtml-parser-perl \
libjpeg-dev \ libjpeg-dev \
libmpc-dev \
libmpfr-dev \
libparse-yapp-perl \ libparse-yapp-perl \
libpng-dev \ libpng-dev \
librsvg2-common \ librsvg2-common \

5
recipes/dev/binutils-gdb/recipe.toml
View File

@ -1,12 +1,13 @@
[source] [source]
git = "https://gitlab.redox-os.org/redox-os/binutils-gdb" git = "https://gitlab.redox-os.org/redox-os/binutils-gdb"
branch = "redox-2.43.1" branch = "redox-2.43.1"
shallow_clone = true
[build] [build]
template = "custom" template = "custom"
dependencies = [ dependencies = [
# "libgmp", "libgmp",
# "libmpfr", "libmpfr",
# TODO: this zlib get linked when boostrapping binutils # TODO: this zlib get linked when boostrapping binutils
# "zlib" # "zlib"
] ]

5
recipes/libs/libgmp/recipe.toml
View File

@ -5,13 +5,10 @@
[source] [source]
tar = "https://ftp.gnu.org/gnu/gmp/gmp-6.3.0.tar.xz" tar = "https://ftp.gnu.org/gnu/gmp/gmp-6.3.0.tar.xz"
blake3 = "fffe4996713928ae19331c8ef39129e46d3bf5b7182820656fd4639435cd83a4" blake3 = "fffe4996713928ae19331c8ef39129e46d3bf5b7182820656fd4639435cd83a4"
script = """
autotools_recursive_regenerate
"""
[build] [build]
template = "custom" template = "custom"
script = """ script = """
DYNAMIC_INIT DYNAMIC_STATIC_INIT
cookbook_configure cookbook_configure
""" """

2
recipes/libs/libmpfr/recipe.toml
View File

@ -11,6 +11,6 @@ dependencies = [
"libgmp", "libgmp",
] ]
script = """ script = """
DYNAMIC_INIT DYNAMIC_STATIC_INIT
cookbook_configure cookbook_configure
""" """

2
recipes/libs/mpc/recipe.toml
View File

@ -14,6 +14,6 @@ dependencies = [
"libmpfr", "libmpfr",
] ]
script = """ script = """
DYNAMIC_INIT DYNAMIC_STATIC_INIT
cookbook_configure cookbook_configure
""" """