vinzenz/redox
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'dynamic_linking' into 'master'

Browse source 
fix(libtool): correct ltversion

See merge request redox-os/redox!1530
This commit is contained in:
Jeremy Soller 2024-12-20 14:25:52 +00:00
commit 0be6bddbb8
1 changed files with 9 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

19
mk/prefix.mk
View file

@ -78,7 +78,7 @@ $(PREFIX)/libtool:
--recurse-submodules \ --recurse-submodules \
"https://gitlab.redox-os.org/andypython/libtool/" \ "https://gitlab.redox-os.org/andypython/libtool/" \
--branch "v$(LIBTOOL_VERSION)-redox" \ --branch "v$(LIBTOOL_VERSION)-redox" \
--depth 1 \ --depth 2 \
"$@.partial" "$@.partial"
touch "$@.partial" touch "$@.partial"
@ -89,18 +89,17 @@ ifeq ($(PODMAN_BUILD),1)
$(PODMAN_RUN) $(MAKE) $@ $(PODMAN_RUN) $(MAKE) $@
else else
mkdir -p "$@.partial" mkdir -p "$@.partial"
cd "$(PREFIX)/libtool" && \ cd "$@.partial" && \
cp -rp $(abspath $(PREFIX)/libtool)/. ./ && \
./bootstrap \ ./bootstrap \
--skip-po \ --skip-po \
--skip-git \
--force \ --force \
--gnulib-srcdir=./gnulib --gnulib-srcdir=./gnulib && \
cd "$@.partial" && \ "$(ROOT)/$</configure" \
"$(ROOT)/$</configure" \ --target="$(TARGET)" \
--target="$(TARGET)" \ --prefix=$(abspath $(PREFIX)/sysroot) && \
--prefix=$(abspath $(PREFIX)/sysroot) \ $(MAKE) -j `$(NPROC)`
&& \
$(MAKE) -j `$(NPROC)`
touch "$@.partial" touch "$@.partial"
mv "$@.partial" "$@" mv "$@.partial" "$@"
endif endif