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

yaboot: fix build w/ gcc10 and host i686/x86_64

Browse source 
The -fcommon is required for gcc10 to build yaboot.
Adding --build=$XBPS_TRIPLET seems to be a good idea in any case
according to the autoconf manual, see the document at:
https://www.gnu.org/software/autoconf/manual/autoconf-2.69/html_node/Hosts-and-Cross_002dCompilation.html

Still gives an error for me trying to build for ppc-musl using any
x86 host environment, be it glibc or musl libc.

More patches required or something else may be wrong?
This commit is contained in:
Jürgen Buchmüller 2020-09-22 23:20:57 +02:00 • committed by Daniel Kolesa
parent 063825747b
commit 424d1ea546
2 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
srcpkgs/yaboot/patches/0003-build-system.patch
View file

@ -22,7 +22,7 @@ Also do not strip the binaries upon install, xbps-src will take care of that.
# command used to get root (needed for tarball creation) # command used to get root (needed for tarball creation)
GETROOT = fakeroot GETROOT = fakeroot
@@ -32,14 +32,17 @@ LD := $(CROSS)ld @@ -32,14 +32,18 @@ LD := $(CROSS)ld
AS := $(CROSS)as AS := $(CROSS)as
OBJCOPY := $(CROSS)objcopy OBJCOPY := $(CROSS)objcopy
@ -39,10 +39,11 @@ Also do not strip the binaries upon install, xbps-src will take care of that.
YBCFLAGS += -DKERNELADDR=$(KERNELADDR) YBCFLAGS += -DKERNELADDR=$(KERNELADDR)
-YBCFLAGS += -Werror -fdiagnostics-show-option -YBCFLAGS += -Werror -fdiagnostics-show-option
+YBCFLAGS += -fgnu89-inline -fno-builtin-malloc -fno-stack-protector -no-pie +YBCFLAGS += -fgnu89-inline -fno-builtin-malloc -fno-stack-protector -no-pie
+YBCFLAGS += -fcommon
YBCFLAGS += -I ./include YBCFLAGS += -I ./include
YBCFLAGS += -fno-strict-aliasing YBCFLAGS += -fno-strict-aliasing
@@ -69,12 +72,12 @@ LFLAGS = -Ttext $(TEXTADDR) -Bstatic -melf32ppclinux @@ -69,12 +72,13 @@ LFLAGS = -Ttext $(TEXTADDR) -Bstatic -melf32ppclinux
# Libraries # Libraries
# #
@ -54,6 +55,7 @@ Also do not strip the binaries upon install, xbps-src will take care of that.
UCFLAGS = -Os $(CFLAGS) -Wall -I/usr/include UCFLAGS = -Os $(CFLAGS) -Wall -I/usr/include
-UCFLAGS += -Werror -fdiagnostics-show-option -UCFLAGS += -Werror -fdiagnostics-show-option
+UCFLAGS += -fdiagnostics-show-option +UCFLAGS += -fdiagnostics-show-option
+UCFLAGS += -fcommon
# For compiling build-tools that run on the host. # For compiling build-tools that run on the host.
# #

1
srcpkgs/yaboot/template
View file

@ -58,6 +58,7 @@ _build_e2fsprogs() {
if [ -n "$_need_cross" -o -n "$CROSS_BUILD" ]; then if [ -n "$_need_cross" -o -n "$CROSS_BUILD" ]; then
# using a crosscompiler, set up configure/compiler for that # using a crosscompiler, set up configure/compiler for that
_args+=" --host=${_need_cross:-$XBPS_CROSS_TRIPLET}" _args+=" --host=${_need_cross:-$XBPS_CROSS_TRIPLET}"
_args+=" --build=$XBPS_TRIPLET"
_ecc="${_need_cross:-$XBPS_CROSS_TRIPLET}-gcc" _ecc="${_need_cross:-$XBPS_CROSS_TRIPLET}-gcc"
_ear="${_need_cross:-$XBPS_CROSS_TRIPLET}-ar" _ear="${_need_cross:-$XBPS_CROSS_TRIPLET}-ar"
fi fi