moritzruth/void-packages
1
0
Fork 0
Code Releases Activity Actions 2

binutils: fix bootstrap build; drop noarch

Browse source 
Prevent configure from finding host installed libdebuginfod.
Enable debuginfod if the chroot is ready.

Closes: #26502
Closes: #27190
This commit is contained in:
Jürgen Buchmüller 2020-12-24 11:16:44 +01:00 • committed by Daniel Kolesa
parent dcc3a0d82d
commit 2769ddd61f
1 changed files with 23 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

33
srcpkgs/binutils/template
View file

@ -1,7 +1,7 @@
# Template file for 'binutils' # Template file for 'binutils'
pkgname=binutils pkgname=binutils
version=2.34 version=2.34
revision=1 revision=2
bootstrap=yes bootstrap=yes
short_desc="GNU binary utilities" short_desc="GNU binary utilities"
maintainer="Enno Boland <gottox@voidlinux.org>" maintainer="Enno Boland <gottox@voidlinux.org>"
@ -10,12 +10,13 @@ homepage="http://www.gnu.org/software/binutils/"
distfiles="${GNU_SITE}/$pkgname/$pkgname-$version.tar.xz" distfiles="${GNU_SITE}/$pkgname/$pkgname-$version.tar.xz"
checksum=f00b0e8803dc9bab1e2165bd568528135be734df3fabf8d0161828cd56028952 checksum=f00b0e8803dc9bab1e2165bd568528135be734df3fabf8d0161828cd56028952
makedepends="zlib-devel"
if [ "$CHROOT_READY" ]; then if [ "$CHROOT_READY" ]; then
hostmakedepends="flex perl texinfo" hostmakedepends="flex perl texinfo"
makedepends+=" elfutils-devel"
checkdepends="bc" checkdepends="bc"
depends="binutils-doc" depends="binutils-doc"
fi fi
makedepends+=" zlib-devel"
_get_triplet() { _get_triplet() {
if [ -z "$XBPS_TRIPLET" ]; then if [ -z "$XBPS_TRIPLET" ]; then
@ -29,13 +30,30 @@ _get_triplet() {
} }
do_configure() { do_configure() {
local CONFIGFLAG="--build=$(_get_triplet)
--prefix=/usr
--enable-threads
--enable-plugins
--enable-secureplt
--with-mmap
--disable-shared
--enable-gold
--disable-werror
--enable-deterministic-archives
--enable-ld=default
--disable-nls"
if [ "$CHROOT_READY" ]; then
CONFIGFLAG+=" --with-debuginfod"
else
CONFIGFLAG+=" --without-debuginfod"
fi
if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
CONFIGFLAG="--enable-64-bit-bfd --enable-multilib" CONFIGFLAG+=" --enable-64-bit-bfd --enable-multilib"
fi fi
if [ "$CROSS_BUILD" ]; then if [ "$CROSS_BUILD" ]; then
# Do not use configure_args nor build_style=gnu-configure, # Do not use configure_args nor build_style=gnu-configure,
# avoiding --with-sysroot to $XBPS_CROSS_BASE. # avoiding --with-sysroot to $XBPS_CROSS_BASE.
CONFIGFLAG="--host=$XBPS_CROSS_TRIPLET --with-build-sysroot=$XBPS_CROSS_BASE" CONFIGFLAG+=" --host=$XBPS_CROSS_TRIPLET --with-build-sysroot=$XBPS_CROSS_BASE"
fi fi
if [ "$XBPS_TARGET_MACHINE" = "mips-musl" -o "$XBPS_TARGET_MACHINE" = "mipsel-musl" ]; then if [ "$XBPS_TARGET_MACHINE" = "mips-musl" -o "$XBPS_TARGET_MACHINE" = "mipsel-musl" ]; then
CONFIGFLAG+=" --with-float=soft --without-fp" CONFIGFLAG+=" --with-float=soft --without-fp"
@ -45,11 +63,7 @@ do_configure() {
elif [ "${XBPS_TARGET_MACHINE%-musl}" = "i686" ]; then elif [ "${XBPS_TARGET_MACHINE%-musl}" = "i686" ]; then
CONFIGFLAG+=" --enable-64-bit-bfd --enable-targets=x86_64-linux-gnu,x86_64-pep" CONFIGFLAG+=" --enable-64-bit-bfd --enable-targets=x86_64-linux-gnu,x86_64-pep"
fi fi
./configure --build=$(_get_triplet) --prefix=/usr --enable-threads \ ./configure $CONFIGFLAG
--enable-plugins --enable-secureplt --with-mmap \
--disable-shared --enable-gold --disable-werror \
--enable-deterministic-archives --enable-ld=default \
--disable-nls $CONFIGFLAG
} }
do_build() { do_build() {
@ -125,7 +139,6 @@ binutils-devel_package() {
} }
binutils-doc_package() { binutils-doc_package() {
archs=noarch
short_desc+=" - info files" short_desc+=" - info files"
pkg_install() { pkg_install() {
vmove usr/share/info vmove usr/share/info