diff --git a/srcpkgs/cross-mipsel-linux-musl/files/non-nullness.patch b/srcpkgs/cross-mipsel-linux-musl/files/non-nullness.patch deleted file mode 120000 index c8b653748f..0000000000 --- a/srcpkgs/cross-mipsel-linux-musl/files/non-nullness.patch +++ /dev/null @@ -1 +0,0 @@ -../../gcc/patches/non-nullness.patch \ No newline at end of file diff --git a/srcpkgs/cross-mipsel-linux-musl/template b/srcpkgs/cross-mipsel-linux-musl/template index 1621d1005d..20cbe0fed0 100644 --- a/srcpkgs/cross-mipsel-linux-musl/template +++ b/srcpkgs/cross-mipsel-linux-musl/template @@ -1,7 +1,7 @@ # Template build file for 'cross-mipsel-linux-musl' # _binutils_version=2.32 -_gcc_version=9.1.0 +_gcc_version=9.2.0 _musl_version=1.1.23 _linux_version=4.19 @@ -11,8 +11,8 @@ _archflags="-march=mips32r2 -msoft-float" _sysroot="/usr/${_triplet}" pkgname=cross-${_triplet} -version=0.31 -revision=3 +version=0.32 +revision=1 short_desc="Cross toolchain for MIPS32r2 LE softfloat target (musl)" maintainer="Orphaned " homepage="https://www.voidlinux.org/" @@ -23,7 +23,7 @@ distfiles=" http://www.musl-libc.org/releases/musl-${_musl_version}.tar.gz ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz" checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04 - 79a66834e96a6050d8fe78db2c3b32fb285b230b855d0a66288235bc04b327a0 + ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206 8a0feb41cef26c97dde382c014e68b9bb335c094bbc1356f6edaaf6b79bd14aa 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1" @@ -33,7 +33,7 @@ nopie=yes nodebug=yes create_wrksrc=yes -hostmakedepends="flex perl python3" +hostmakedepends="gcc-objc flex perl python3" makedepends="zlib-devel gmp-devel mpfr-devel libmpc-devel isl15-devel" nostrip_files="libcaf_single.a libgcc.a libgcov.a libgcc_eh.a libgnarl_pic.a libgnarl.a libgnat_pic.a libgnat.a" @@ -84,7 +84,6 @@ _gcc_bootstrap() { cd ${wrksrc}/gcc-${_gcc_version} _apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch - _apply_patch -p0 ${FILESDIR}/non-nullness.patch _apply_patch -p0 ${FILESDIR}/musl-ada.patch _apply_patch -p1 ${FILESDIR}/libgnarl-musl.patch _apply_patch -p0 ${FILESDIR}/invalid_tls_model.patch @@ -169,7 +168,7 @@ _gcc_build() { _args+=" --libexecdir=/usr/lib" _args+=" --target=${_triplet}" _args+=" --with-sysroot=${_sysroot}" - _args+=" --enable-languages=c,ada,c++,fortran,lto" + _args+=" --enable-languages=c,ada,c++,objc,obj-c++,fortran,lto" _args+=" --enable-libada" _args+=" --enable-lto" _args+=" --enable-default-pie" @@ -180,6 +179,7 @@ _gcc_build() { _args+=" --disable-libquadmath" _args+=" --disable-libmpx" _args+=" --disable-libmudflap" + _args+=" --disable-libatomic" _args+=" --enable-shared" _args+=" ${_fpuflags}"