fix(mk/prefix.mk): correct ltversion
The script `build-aux/git-version-gen` needs sufficient depth to correctly determine the version. Also it has to be in tree, otherwise the version is reported as 'UNKNOWN', breaking some packages. Signed-off-by: Anhad Singh <andypython@protonmail.com>
This commit is contained in:
parent
6450defff0
commit
f8d2c7ed4b
19
mk/prefix.mk
19
mk/prefix.mk
|
@ -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
|
||||||
|
|
Loading…
Reference in a new issue