diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template index 11cd1e45527..a8124be8601 100644 --- a/srcpkgs/gcc/template +++ b/srcpkgs/gcc/template @@ -1,15 +1,29 @@ # Template build file for 'gcc'. _majorver=7.2 +_gmp_version=6.1.2 +_mpfr_version=4.0.0 +_mpc_version=1.1.0 +_isl_version=0.16.1 pkgname=gcc version=${_majorver}.0 -revision=4 +revision=5 short_desc="The GNU C Compiler" maintainer="Juan RP " homepage="http://gcc.gnu.org" license="GFDL-1.2, GPL-3, LGPL-2.1" -distfiles="${GNU_SITE}/gcc/gcc-${version}/gcc-${version}.tar.xz" -checksum=1cf7adf8ff4b5aa49041c8734bbcf1ad18cc4c94d0029aae0f4e48841088479a +distfiles=" + ${GNU_SITE}/gcc/gcc-${version}/gcc-${version}.tar.xz + https://gmplib.org/download/gmp/gmp-${_gmp_version}.tar.xz + http://www.mpfr.org/mpfr-${_mpfr_version}/mpfr-${_mpfr_version}.tar.xz + https://ftp.gnu.org/gnu/mpc/mpc-${_mpc_version}.tar.gz + http://isl.gforge.inria.fr/isl-${_isl_version}.tar.bz2" +checksum=" + 1cf7adf8ff4b5aa49041c8734bbcf1ad18cc4c94d0029aae0f4e48841088479a + 87b565e89a9a684fe4ebeeddb8399dce2599f9c9049854ca8c0dfbdea0e21912 + fbe2cd1418b321f5c899ce4f0f0f4e73f5ecc7d02145b0e1fd096f5c3afb8a1d + 6985c538143c1208dcb1ac42cedad6ff52e267b47e5f970183a3e75125b43c2e + 412538bb65c799ac98e17e8cfcdacbb257a57362acfaaff254b0fcae970126d2" nopie=yes lib32disabled=yes @@ -19,7 +33,7 @@ replaces="gcc-gcj<7.2.0 gcc-gcj-jdk-compat<7.2.0" if [ "$CHROOT_READY" ]; then hostmakedepends="perl flex" fi -makedepends="zlib-devel libmpc-devel isl15-devel" +makedepends="zlib-devel" depends="binutils libgcc-devel-${version}_${revision} libstdc++-devel-${version}_${revision} libssp-devel-${version}_${revision}" @@ -76,6 +90,14 @@ case "$XBPS_TARGET_MACHINE" in *) subpackages+=" libitm libitm-devel";; esac +post_extract() { + mkdir -p ${wrksrc}/{gmp,mpfr,mpc,isl} + cp -ar ${XBPS_BUILDDIR}/gmp-${_gmp_version}/* ${wrksrc}/gmp/ + cp -ar ${XBPS_BUILDDIR}/mpfr-${_mpfr_version}/* ${wrksrc}/mpfr/ + cp -ar ${XBPS_BUILDDIR}/mpc-${_mpc_version}/* ${wrksrc}/mpc/ + cp -ar ${XBPS_BUILDDIR}/isl-${_isl_version}/* ${wrksrc}/isl/ +} + pre_configure() { # _FORTIFY_SOURCE needs an optimization level. sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" {gcc,libiberty}/configure @@ -118,10 +140,6 @@ do_configure() { else if [ -z "$CHROOT_READY" ]; then export LD_LIBRARY_PATH="${XBPS_MASTERDIR}/usr/lib" - _args+=" --with-gmp=${XBPS_MASTERDIR}/usr" - _args+=" --with-mpfr=${XBPS_MASTERDIR}/usr" - _args+=" --with-isl=${XBPS_MASTERDIR}/usr" - _args+=" --with-mpc=${XBPS_MASTERDIR}/usr" _args+=" --build=${_triplet}" else _langs="c,c++,objc,obj-c++,fortran,lto"