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

gcc-multilib: update to 10.2.1pre1

Browse source
This commit is contained in:
Jürgen Buchmüller 2021-01-23 19:49:15 +01:00
parent 37b8d9681b
commit f7b1756268
2 changed files with 15 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

22
srcpkgs/gcc-multilib/patches/fix-libiberty_pic.patch
View file

@ -1,22 +1,12 @@
--- libiberty/Makefile.in 2016-08-05 17:07:27.540554328 +0200 --- libiberty/Makefile.in 2020-12-03 20:45:14.000000000 +0100
+++ libiberty/Makefile.in 2016-08-05 17:18:39.727540789 +0200 +++ libiberty/Makefile.in 2021-01-23 18:39:45.891324445 +0100
@@ -112,8 +112,8 @@ @@ -111,7 +111,7 @@
INCDIR=$(srcdir)/$(MULTISRCTOP)../include INCDIR=$(srcdir)/$(MULTISRCTOP)../include
-COMPILE.c = $(CC) -c @DEFS@ $(CFLAGS) $(CPPFLAGS) -I. -I$(INCDIR) \ -COMPILE.c = $(CC) -c @DEFS@ $(CFLAGS) $(CPPFLAGS) -I. -I$(INCDIR) \
- $(HDEFINES) @ac_libiberty_warn_cflags@ -D_GNU_SOURCE - $(HDEFINES) @ac_libiberty_warn_cflags@ -D_GNU_SOURCE \
+COMPILE.c = $(CC) -c @DEFS@ $(CFLAGS) $(CPPFLAGS) -fPIC -I. -I$(INCDIR) \ +COMPILE.c = $(CC) -c @DEFS@ $(CFLAGS) $(CPPFLAGS) -fPIC -I. -I$(INCDIR) \
+ $(HDEFINES) @ac_libiberty_warn_cflags@ -D_DEFAULT_SOURCE + $(HDEFINES) @ac_libiberty_warn_cflags@ -D_DEFAULT_SOURCE \
@CET_HOST_FLAGS@
# Just to make sure we don't use a built-in rule with VPATH
.c.$(objext):
@@ -401,7 +401,7 @@
demangle: $(ALL) $(srcdir)/cp-demangle.c
@echo "The standalone demangler, now named c++filt, is now"
@echo "a part of binutils."
- $(CC) @DEFS@ $(CFLAGS) $(CPPFLAGS) -I. -I$(INCDIR) $(HDEFINES) \
+ $(CC) @DEFS@ $(CFLAGS) $(CPPFLAGS) -fPIC -I. -I$(INCDIR) $(HDEFINES) \
$(srcdir)/cp-demangle.c -DSTANDALONE_DEMANGLER $(TARGETLIB) -o $@
ls:

25
srcpkgs/gcc-multilib/template
View file

@ -1,18 +1,18 @@
# Template file for 'gcc-multilib' # Template file for 'gcc-multilib'
archs="x86_64" archs="x86_64"
_triplet="x86_64-unknown-linux-gnu" _triplet="x86_64-unknown-linux-gnu"
_majorver=9.3 _majorver=10.2
pkgname=gcc-multilib pkgname=gcc-multilib
version=${_majorver}.0 version=${_majorver}.1pre1
revision=2 revision=1
wrksrc="gcc-${version}" wrksrc=gcc-${version/pre/_pre}
short_desc="GNU Compiler Collection (multilib files)" short_desc="GNU Compiler Collection (multilib files)"
maintainer="Orphaned <orphan@voidlinux.org>" maintainer="Orphaned <orphan@voidlinux.org>"
homepage="http://gcc.gnu.org" homepage="http://gcc.gnu.org"
license="GFDL-1.2-or-later, GPL-3.0-or-later, LGPL-2.1-or-later" license="GFDL-1.2-or-later, GPL-3.0-or-later, LGPL-2.1-or-later"
distfiles="${GNU_SITE}/gcc/gcc-${version}/gcc-${version}.tar.xz" distfiles="https://dev.alpinelinux.org/~nenolod/gcc-${version/pre/_pre}.tar.xz"
checksum=71e197867611f6054aa1119b13a0c0abac12834765fe2d81f35ac57f84f742d1 checksum=772cfd5d30eb9cc5a996fec9ba8cdcb45d37df1c9b5770610103b814b732c590
hostmakedepends="perl flex tar zip unzip" hostmakedepends="perl flex tar zip unzip"
makedepends="zlib-devel libmpc-devel isl15-devel libfl-devel makedepends="zlib-devel libmpc-devel isl15-devel libfl-devel
@ -71,13 +71,8 @@ do_build() {
make ${makejobs} make ${makejobs}
} }
do_install() { do_install() {
local _pc_triplet=x86_64-pc-linux-gnu local _pc_triplet=x86_64-pc-linux-gnu _version=${version%pre1}
# Install to a tempdir and then only copy relevant files. # Install to a tempdir and then only copy relevant files.
if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
vmkdir usr/lib
cd ${DESTDIR}/usr
ln -sf lib lib64
fi
cd ${wrksrc} cd ${wrksrc}
make DESTDIR=${wrksrc}/${pkgname}-build install make DESTDIR=${wrksrc}/${pkgname}-build install
@ -86,14 +81,12 @@ do_install() {
vmkdir usr/include/c++/${_majorver}/${_triplet} vmkdir usr/include/c++/${_majorver}/${_triplet}
vmkdir usr/lib/gcc/${_triplet}/${_majorver} vmkdir usr/lib/gcc/${_triplet}/${_majorver}
cp -a ${wrksrc}/${pkgname}-build/usr/lib/gcc/${_pc_triplet}/${version}/32 \ cp -a ${wrksrc}/${pkgname}-build/usr/lib/gcc/${_pc_triplet}/${_version}/32 \
${DESTDIR}/usr/lib/gcc/${_triplet}/${_majorver}/ ${DESTDIR}/usr/lib/gcc/${_triplet}/${_majorver}/
cp -a ${wrksrc}/${pkgname}-build/usr/include/c++/${version}/${_pc_triplet}/32 \ cp -a ${wrksrc}/${pkgname}-build/usr/include/c++/${_version}/${_pc_triplet}/32 \
${DESTDIR}/usr/include/c++/${_majorver}/${_triplet} ${DESTDIR}/usr/include/c++/${_majorver}/${_triplet}
vinstall ${wrksrc}/host-${_pc_triplet}/gcc/specs 644 usr/lib/gcc/${_triplet}/${_majorver} vinstall ${wrksrc}/host-${_pc_triplet}/gcc/specs 644 usr/lib/gcc/${_triplet}/${_majorver}
rm -f ${DESTDIR}/usr/lib64
} }
gcc-objc-multilib_package() { gcc-objc-multilib_package() {