From: pullmoll <pullmoll@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] binutils: fix bootstrap build; drop noarch
Date: Thu, 24 Dec 2020 15:08:21 +0100 [thread overview]
Message-ID: <20201224140821.wdlgi2HApsCUY1QuWTchqcKt58mM3IfvzcuatSD8yxs@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-27397@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 476 bytes --]
There is an updated pull request by pullmoll against master on the void-packages repository
https://github.com/pullmoll/void-packages binutils
https://github.com/void-linux/void-packages/pull/27397
binutils: fix bootstrap build; drop noarch
Prevent configure from finding host installed libdebuginfod.
Enable debuginfod if the chroot is ready.
Closes: #26502
Closes: #27190
A patch file from https://github.com/void-linux/void-packages/pull/27397.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-binutils-27397.patch --]
[-- Type: text/x-diff, Size: 3053 bytes --]
From b5be9012881c18747d763721368e88ad0f012a26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Thu, 24 Dec 2020 11:16:44 +0100
Subject: [PATCH] binutils: fix bootstrap build; drop noarch
Prevent configure from finding host installed libdebuginfod.
Enable debuginfod if the chroot is ready.
Closes: #26502
Closes: #27190
---
srcpkgs/binutils/template | 33 +++++++++++++++++++++++----------
1 file changed, 23 insertions(+), 10 deletions(-)
diff --git a/srcpkgs/binutils/template b/srcpkgs/binutils/template
index 719897d6f50..16826c6bec4 100644
--- a/srcpkgs/binutils/template
+++ b/srcpkgs/binutils/template
@@ -1,7 +1,7 @@
# Template file for 'binutils'
pkgname=binutils
version=2.34
-revision=1
+revision=2
bootstrap=yes
short_desc="GNU binary utilities"
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"
checksum=f00b0e8803dc9bab1e2165bd568528135be734df3fabf8d0161828cd56028952
+makedepends="zlib-devel"
if [ "$CHROOT_READY" ]; then
hostmakedepends="flex perl texinfo"
+ makedepends+=" elfutils-devel"
checkdepends="bc"
depends="binutils-doc"
fi
-makedepends+=" zlib-devel"
_get_triplet() {
if [ -z "$XBPS_TRIPLET" ]; then
@@ -29,13 +30,30 @@ _get_triplet() {
}
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
- CONFIGFLAG="--enable-64-bit-bfd --enable-multilib"
+ CONFIGFLAG+=" --enable-64-bit-bfd --enable-multilib"
fi
if [ "$CROSS_BUILD" ]; then
# Do not use configure_args nor build_style=gnu-configure,
# 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
if [ "$XBPS_TARGET_MACHINE" = "mips-musl" -o "$XBPS_TARGET_MACHINE" = "mipsel-musl" ]; then
CONFIGFLAG+=" --with-float=soft --without-fp"
@@ -45,11 +63,7 @@ do_configure() {
elif [ "${XBPS_TARGET_MACHINE%-musl}" = "i686" ]; then
CONFIGFLAG+=" --enable-64-bit-bfd --enable-targets=x86_64-linux-gnu,x86_64-pep"
fi
- ./configure --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 $CONFIGFLAG
+ ./configure $CONFIGFLAG
}
do_build() {
@@ -125,7 +139,6 @@ binutils-devel_package() {
}
binutils-doc_package() {
- archs=noarch
short_desc+=" - info files"
pkg_install() {
vmove usr/share/info
next prev parent reply other threads:[~2020-12-24 14:08 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-24 10:19 [PR PATCH] " pullmoll
2020-12-24 14:02 ` [PR PATCH] [Updated] " pullmoll
2020-12-24 14:05 ` pullmoll
2020-12-24 14:08 ` pullmoll [this message]
2020-12-24 21:41 ` pullmoll
2020-12-26 2:44 ` [PR PATCH] [Merged]: " q66
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201224140821.wdlgi2HApsCUY1QuWTchqcKt58mM3IfvzcuatSD8yxs@z \
--to=pullmoll@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).