mirror of
https://github.com/void-linux/void-packages.git
synced 2025-06-05 06:33:50 +02:00
binutils: fix bootstrap on host without zstd and makeinfo
This commit is contained in:
parent
014ca1d1ac
commit
5704c8e560
1 changed files with 11 additions and 5 deletions
|
@ -15,14 +15,16 @@ checksum=ae9a5789e23459e59606e6714723f2d3ffc31c03174191ef0d015bdf06007450
|
||||||
build_options="all_targets"
|
build_options="all_targets"
|
||||||
desc_option_all_targets="Enable all supported targets"
|
desc_option_all_targets="Enable all supported targets"
|
||||||
|
|
||||||
subpackages="binutils-doc"
|
|
||||||
|
|
||||||
if [ "$CHROOT_READY" ]; then
|
if [ "$CHROOT_READY" ]; then
|
||||||
hostmakedepends+=" flex perl texinfo"
|
hostmakedepends+=" flex perl texinfo"
|
||||||
makedepends+=" elfutils-devel"
|
makedepends+=" elfutils-devel"
|
||||||
checkdepends="bc"
|
checkdepends="bc"
|
||||||
depends="binutils-doc binutils-libs"
|
depends="binutils-doc binutils-libs"
|
||||||
subpackages+=" libiberty-devel binutils-libs binutils-devel"
|
unset subpackages _makeinfo
|
||||||
|
else
|
||||||
|
_makeinfo=MAKEINFO=/bin/true
|
||||||
|
# Set to space force no subpackages
|
||||||
|
subpackages=" "
|
||||||
fi
|
fi
|
||||||
|
|
||||||
_get_triplet() {
|
_get_triplet() {
|
||||||
|
@ -43,6 +45,10 @@ do_configure() {
|
||||||
conf+=" --with-debuginfod --enable-shared --enable-install-libiberty"
|
conf+=" --with-debuginfod --enable-shared --enable-install-libiberty"
|
||||||
else
|
else
|
||||||
conf+=" --without-debuginfod --disable-shared --disable-install-libbfd"
|
conf+=" --without-debuginfod --disable-shared --disable-install-libbfd"
|
||||||
|
sed -i "
|
||||||
|
s;zlibinc=\$;&-I${XBPS_MASTERDIR}/usr/include;
|
||||||
|
s;zlibdir=\$;&-L${XBPS_MASTERDIR}/usr/lib;
|
||||||
|
" */configure
|
||||||
fi
|
fi
|
||||||
if [ "$CROSS_BUILD" ]; then
|
if [ "$CROSS_BUILD" ]; then
|
||||||
# we don't want --with-sysroot=${XBPS_CROSS_BASE} like gnu-configure
|
# we don't want --with-sysroot=${XBPS_CROSS_BASE} like gnu-configure
|
||||||
|
@ -114,7 +120,7 @@ do_configure() {
|
||||||
}
|
}
|
||||||
|
|
||||||
do_build() {
|
do_build() {
|
||||||
cd ${wrksrc}/build && make ${makejobs}
|
cd ${wrksrc}/build && make ${makejobs} ${_makeinfo}
|
||||||
}
|
}
|
||||||
|
|
||||||
# there is a testsuite now, but e.g. ifunc tests all fail on musl and
|
# there is a testsuite now, but e.g. ifunc tests all fail on musl and
|
||||||
|
@ -129,7 +135,7 @@ do_install() {
|
||||||
cd ${wrksrc}/build
|
cd ${wrksrc}/build
|
||||||
|
|
||||||
local _triplet=$(_get_triplet)
|
local _triplet=$(_get_triplet)
|
||||||
make DESTDIR=${DESTDIR} tooldir=/usr install
|
make DESTDIR=${DESTDIR} tooldir=/usr install ${_makeinfo}
|
||||||
|
|
||||||
cd ..
|
cd ..
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue