From e2b5afe0c68456a1f5e85ff9bdfe604560ad491d Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sat, 26 Nov 2016 19:05:23 +0100 Subject: [PATCH] cross-armv7l-linux-gnueabihf: update to 0.22. --- .../files/fix-cxxflags-passing.patch | 1 + .../files/gcc-spec-env-r1.patch | 1 - srcpkgs/cross-armv7l-linux-gnueabihf/template | 150 ++++++++++++------ 3 files changed, 105 insertions(+), 47 deletions(-) create mode 120000 srcpkgs/cross-armv7l-linux-gnueabihf/files/fix-cxxflags-passing.patch delete mode 120000 srcpkgs/cross-armv7l-linux-gnueabihf/files/gcc-spec-env-r1.patch diff --git a/srcpkgs/cross-armv7l-linux-gnueabihf/files/fix-cxxflags-passing.patch b/srcpkgs/cross-armv7l-linux-gnueabihf/files/fix-cxxflags-passing.patch new file mode 120000 index 0000000000..4a8c831e61 --- /dev/null +++ b/srcpkgs/cross-armv7l-linux-gnueabihf/files/fix-cxxflags-passing.patch @@ -0,0 +1 @@ +../../gcc/patches/fix-cxxflags-passing.patch \ No newline at end of file diff --git a/srcpkgs/cross-armv7l-linux-gnueabihf/files/gcc-spec-env-r1.patch b/srcpkgs/cross-armv7l-linux-gnueabihf/files/gcc-spec-env-r1.patch deleted file mode 120000 index 8dd149359e..0000000000 --- a/srcpkgs/cross-armv7l-linux-gnueabihf/files/gcc-spec-env-r1.patch +++ /dev/null @@ -1 +0,0 @@ -../../gcc/patches/gcc-spec-env-r1.patch \ No newline at end of file diff --git a/srcpkgs/cross-armv7l-linux-gnueabihf/template b/srcpkgs/cross-armv7l-linux-gnueabihf/template index f183be296a..5eb527571d 100644 --- a/srcpkgs/cross-armv7l-linux-gnueabihf/template +++ b/srcpkgs/cross-armv7l-linux-gnueabihf/template @@ -1,9 +1,9 @@ # Template build file for 'cross-armv7l-linux-gnueabihf' # _binutils_version=2.27 -_gcc_version=4.9.4 +_gcc_version=6.2.1 _glibc_version=2.24 -_linux_version=3.18.25 +_linux_version=4.1.34 _triplet=armv7l-linux-gnueabihf _fpuflags="--with-arch=armv7-a --with-fpu=vfpv3 --with-float=hard" @@ -11,22 +11,22 @@ _archflags="-march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard" _sysroot="/usr/${_triplet}" pkgname=cross-${_triplet} -version=0.21 -revision=4 +version=0.22 +revision=1 short_desc="GNU Cross toolchain for the ${_triplet} LE target (binutils/gcc/glibc)" maintainer="Juan RP " homepage="http://www.voidlinux.eu" license="GPL-3,GPL-2,LGPL-2.1" distfiles=" - http://ftp.gnu.org/pub/gnu/binutils/binutils-${_binutils_version}.tar.bz2 - http://ftp.gnu.org/pub/gnu/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.bz2 + ${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.bz2 + https://repo.voidlinux.eu/distfiles/gcc-$_gcc_version.tar.xz http://ftp.gnu.org/gnu/glibc/glibc-${_glibc_version}.tar.xz - http://www.kernel.org/pub/linux/kernel/v3.x/linux-${_linux_version}.tar.xz" + ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz" checksum=" 369737ce51587f92466041a97ab7d2358c6d9e1b6490b3940eb09fb0a9a6ac88 - 6c11d292cd01b294f9f84c9a59c230d80e9e4a47e5c6355f046bb36d4f358092 + a7addd2d4e42e66c3b56ced8baee5a11ef7fb577e23615a4f43877273eaf9409 99d4a3e8efd144d71488e478f62587578c0f4e1fa0b4eed47ee3d4975ebeb5d3 - c649874e2856101df7cefe5fdad313ebb2282a939fc1e95cf02222327745ff92" + 412316b32b5c7a513ba3ab8e68fc443db4d9423f07b577473089def0ee7406af" lib32disabled=yes nocross=yes @@ -64,6 +64,8 @@ _linux_headers() { } _binutils_build() { + local _args + [ -f ${wrksrc}/.binutils_build_done ] && return 0 cd ${wrksrc} @@ -71,10 +73,15 @@ _binutils_build() { [ ! -d binutils-build ] && mkdir binutils-build cd binutils-build - ../binutils-${_binutils_version}/configure \ - --prefix=/usr --target=${_triplet} \ - --with-sysroot=${_sysroot} --disable-nls --disable-shared \ - --disable-multilib --disable-werror + _args="--prefix=/usr" + _args+=" --target=${_triplet}" + _args+=" --with-sysroot=${_sysroot}" + _args+=" --disable-nls" + _args+=" --disable-shared" + _args+=" --disable-multilib" + _args+=" --disable-werror" + + ../binutils-${_binutils_version}/configure ${_args} make configure-host make ${makejobs} @@ -84,26 +91,42 @@ _binutils_build() { } _gcc_bootstrap() { + local _args + [ -f ${wrksrc}/.gcc_bootstrap_done ] && return 0 cd ${wrksrc}/gcc-${_gcc_version} _apply_patch -p0 ${FILESDIR}/libcpp-source_date_epoch.patch - _apply_patch -p0 ${FILESDIR}/gcc-spec-env-r1.patch + _apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch msg_normal "Building cross gcc bootstrap\n" [ ! -d ../gcc-bootstrap ] && mkdir ../gcc-bootstrap cd ../gcc-bootstrap + _args="--prefix=/usr" + _args+=" --target=${_triplet}" + _args+=" --without-headers" + _args+=" --disable-nls" + _args+=" --disable-shared" + _args+=" --disable-libquadmath" + _args+=" --disable-decimal-float" + _args+=" --disable-libgomp" + _args+=" --disable-libmpx" + _args+=" --disable-libmudflap" + _args+=" --disable-libssp" + _args+=" --disable-libitm" + _args+=" --disable-libatomic" + _args+=" --disable-threads" + _args+=" --enable-languages=c" + _args+=" --disable-sjlj-exceptions" + _args+=" --disable-multilib" + _args+=" --with-gnu-ld" + _args+=" --with-gnu-as" + _args+=" ${_fpuflags}" + CFLAGS="-O0 -g0" CXXFLAGS="-O0 -g0" \ - ../gcc-${_gcc_version}/configure --prefix=/usr \ - --target=${_triplet} --without-headers \ - --disable-nls --disable-shared --disable-libquadmath \ - --disable-decimal-float --disable-libgomp --disable-libmudflap \ - --disable-libssp --disable-libitm --disable-libatomic \ - --disable-threads --enable-languages=c \ - --disable-sjlj-exceptions --disable-multilib \ - --with-gnu-ld --with-gnu-as ${_fpuflags} + ../gcc-${_gcc_version}/configure ${_args} make ${makejobs} make install @@ -112,6 +135,8 @@ _gcc_bootstrap() { } _glibc_headers() { + local _args + [ -f ${wrksrc}/.glibc_headers_done ] && return 0 cd ${wrksrc} @@ -126,11 +151,15 @@ _glibc_headers() { export CC="${_triplet}-gcc" LD="${_triplet}-ld" \ AS="${_triplet}-as" CPP="${_triplet}-cpp" - ../glibc-${_glibc_version}/configure \ - --host=${_triplet} --prefix=/usr \ - --with-headers=${_sysroot}/usr/include \ - --config-cache --enable-obsolete-rpc \ - --enable-kernel=2.6.27 ${_fpuflags} + _args="--prefix=/usr" + _args+=" --host=${_triplet}" + _args+=" --with-headers=${_sysroot}/usr/include" + _args+=" --config-cache" + _args+=" --enable-obsolete-rpc" + _args+=" --enable-kernel=2.6.27" + _args+=" ${_fpuflags}" + + ../glibc-${_glibc_version}/configure ${_args} make -k install-headers cross_compiling=yes \ install_root=${_sysroot} @@ -139,6 +168,8 @@ _glibc_headers() { } _glibc_build() { + local _args + [ -f ${wrksrc}/.glibc_build_done ] && return 0 cd ${wrksrc} @@ -154,11 +185,17 @@ _glibc_build() { AS="${_triplet}-as" CPP="${_triplet}-cpp" export CFLAGS="-Os -pipe ${_archflags}" - ../glibc-${_glibc_version}/configure \ - --host=${_triplet} --prefix=/usr \ - --with-headers=${_sysroot}/usr/include \ - --config-cache --disable-profile --enable-obsolete-rpc \ - --disable-werror --enable-kernel=2.6.27 ${_fpuflags} + _args="--prefix=/usr" + _args+=" --host=${_triplet}" + _args+=" --with-headers=${_sysroot}/usr/include" + _args+=" --config-cache" + _args+=" --disable-profile" + _args+=" --enable-obsolete-rpc" + _args+=" --disable-werror" + _args+=" --enable-kernel=2.6.27" + _args+=" ${_fpuflags}" + + ../glibc-${_glibc_version}/configure ${_args} make ${makejobs} make install_root=${_sysroot} install @@ -167,6 +204,8 @@ _glibc_build() { } _gcc_build() { + local _args + [ -f ${wrksrc}/.gcc_build_done ] && return 0 cd ${wrksrc} @@ -185,20 +224,39 @@ _gcc_build() { touch .sed_subst_done fi - ../gcc-${_gcc_version}/configure \ - --target=${_triplet} --prefix=/usr --libdir=/usr/lib \ - --libexecdir=/usr/lib --with-sysroot=${_sysroot} \ - --enable-languages=c,c++,lto \ - --with-gnu-as --with-gnu-ld --disable-multilib \ - --disable-werror --disable-nls --disable-sjlj-exceptions \ - --enable-threads=posix --enable-long-longx \ - --enable-shared --enable-linker-build-id \ - --enable-gnu-unique-object --enable-lto \ - --disable-libquadmath --disable-libatomic \ - --disable-libssp --disable-libmudflap \ - --disable-libsanitizer --disable-libcilkrts \ - --disable-libitm --disable-libvtv --disable-libstdcxx-pch \ - --enable-libstdcxx-time --with-linker-hash-style=gnu ${_fpuflags} + _args="--prefix=/usr" + _args+=" --libdir=/usr/lib" + _args+=" --libexecdir=/usr/lib" + _args+=" --target=${_triplet}" + _args+=" --with-sysroot=${_sysroot}" + _args+=" --enable-languages=c,c++,lto" + _args+=" --with-gnu-as" + _args+=" --with-gnu-ld" + _args+=" --disable-multilib" + _args+=" --disable-werror" + _args+=" --disable-nls" + _args+=" --disable-sjlj-exceptions" + _args+=" --enable-threads=posix" + _args+=" --enable-long-longx" + _args+=" --enable-shared" + _args+=" --enable-linker-build-id" + _args+=" --enable-gnu-unique-object" + _args+=" --enable-lto" + _args+=" --disable-libquadmath" + _args+=" --disable-libatomic" + _args+=" --disable-libssp" + _args+=" --disable-libmpx" + _args+=" --disable-libmudflap" + _args+=" --disable-libsanitizer" + _args+=" --disable-libcilkrts" + _args+=" --disable-libitm" + _args+=" --disable-libvtv" + _args+=" --disable-libstdcxx-pch" + _args+=" --enable-libstdcxx-time" + _args+=" --with-linker-hash-style=gnu" + _args+=" ${_fpuflags}" + + ../gcc-${_gcc_version}/configure ${_args} make ${makejobs}