From 010582f09a0b856061f4f177d548d311a98b855d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Sat, 23 Jan 2021 19:49:15 +0100 Subject: [PATCH] gcc-multilib: update to 10.2.1pre1 --- .../patches/fix-libiberty_pic.patch | 22 +++++----------- srcpkgs/gcc-multilib/template | 25 +++++++------------ 2 files changed, 15 insertions(+), 32 deletions(-) diff --git a/srcpkgs/gcc-multilib/patches/fix-libiberty_pic.patch b/srcpkgs/gcc-multilib/patches/fix-libiberty_pic.patch index 134846c45f4..54259bc2bb5 100644 --- a/srcpkgs/gcc-multilib/patches/fix-libiberty_pic.patch +++ b/srcpkgs/gcc-multilib/patches/fix-libiberty_pic.patch @@ -1,22 +1,12 @@ ---- libiberty/Makefile.in 2016-08-05 17:07:27.540554328 +0200 -+++ libiberty/Makefile.in 2016-08-05 17:18:39.727540789 +0200 -@@ -112,8 +112,8 @@ +--- libiberty/Makefile.in 2020-12-03 20:45:14.000000000 +0100 ++++ libiberty/Makefile.in 2021-01-23 18:39:45.891324445 +0100 +@@ -111,7 +111,7 @@ INCDIR=$(srcdir)/$(MULTISRCTOP)../include -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) \ -+ $(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: diff --git a/srcpkgs/gcc-multilib/template b/srcpkgs/gcc-multilib/template index 6d2240d055e..07ceeccc93d 100644 --- a/srcpkgs/gcc-multilib/template +++ b/srcpkgs/gcc-multilib/template @@ -1,18 +1,18 @@ # Template file for 'gcc-multilib' archs="x86_64" _triplet="x86_64-unknown-linux-gnu" -_majorver=9.3 +_majorver=10.2 pkgname=gcc-multilib -version=${_majorver}.0 -revision=2 -wrksrc="gcc-${version}" +version=${_majorver}.1pre1 +revision=1 +wrksrc=gcc-${version/pre/_pre} short_desc="GNU Compiler Collection (multilib files)" maintainer="Orphaned " homepage="http://gcc.gnu.org" 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" -checksum=71e197867611f6054aa1119b13a0c0abac12834765fe2d81f35ac57f84f742d1 +distfiles="https://dev.alpinelinux.org/~nenolod/gcc-${version/pre/_pre}.tar.xz" +checksum=772cfd5d30eb9cc5a996fec9ba8cdcb45d37df1c9b5770610103b814b732c590 hostmakedepends="perl flex tar zip unzip" makedepends="zlib-devel libmpc-devel isl15-devel libfl-devel @@ -71,13 +71,8 @@ do_build() { make ${makejobs} } 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. - if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then - vmkdir usr/lib - cd ${DESTDIR}/usr - ln -sf lib lib64 - fi cd ${wrksrc} make DESTDIR=${wrksrc}/${pkgname}-build install @@ -86,14 +81,12 @@ do_install() { vmkdir usr/include/c++/${_majorver}/${_triplet} 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}/ - 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} vinstall ${wrksrc}/host-${_pc_triplet}/gcc/specs 644 usr/lib/gcc/${_triplet}/${_majorver} - - rm -f ${DESTDIR}/usr/lib64 } gcc-objc-multilib_package() {