diff --git a/srcpkgs/cross-mips-linux-muslhf/files/musl-ada.patch b/srcpkgs/cross-mips-linux-muslhf/files/musl-ada.patch new file mode 120000 index 00000000000..64906d48ecb --- /dev/null +++ b/srcpkgs/cross-mips-linux-muslhf/files/musl-ada.patch @@ -0,0 +1 @@ +../../gcc/patches/musl-ada.patch \ No newline at end of file diff --git a/srcpkgs/cross-mips-linux-muslhf/template b/srcpkgs/cross-mips-linux-muslhf/template index c3decc13db6..ea5478cfeed 100644 --- a/srcpkgs/cross-mips-linux-muslhf/template +++ b/srcpkgs/cross-mips-linux-muslhf/template @@ -1,9 +1,9 @@ # Template build file for 'cross-mips-linux-muslhf' # -_binutils_version=2.29.1 +_binutils_version=2.31.1 _gcc_version=8.2.0 _musl_version=1.1.20 -_linux_version=4.9.8 +_linux_version=4.19 _triplet=mips-linux-muslhf _fpuflags="--with-float=hard --with-fp" @@ -11,22 +11,21 @@ _archflags="-march=mips32r2 -mhard-float" _sysroot="/usr/${_triplet}" pkgname=cross-${_triplet} -version=0.28 +version=0.29 revision=1 short_desc="Cross toolchain for MIPS32r2 BE hardfloat target (musl)" maintainer="hipperson0 " -homepage="https://www.voidlinux.eu" +homepage="https://www.voidlinux.org/" license="GPL-2.0-or-later, GPL-3.0-or-later, MIT" distfiles=" - ${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.bz2 + ${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz - ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz - https://www.musl-libc.org/releases/musl-${_musl_version}.tar.gz" -checksum=" - 1509dff41369fb70aed23682351b663b56db894034773e6dbf7d5d6071fc55cc + https://www.musl-libc.org/releases/musl-${_musl_version}.tar.gz + ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz" +checksum="5d20086ecf5752cc7d9134246e9588fa201740d540f7eb84d795b1f7a93bca86 196c3c04ba2613f893283977e6011b2345d1cd1af9abeac58e916b1aab3e0080 - 150bb7f2dd4849b5d21b8ccd8d05294a48229e1fcb93a22e7b806a79ec0b0e45 - 44be8771d0e6c6b5f82dd15662eb2957c9a3173a19a8b49966ac0542bbd40d61" + 44be8771d0e6c6b5f82dd15662eb2957c9a3173a19a8b49966ac0542bbd40d61 + 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1" lib32disabled=yes nocross=yes @@ -34,9 +33,10 @@ nopie=yes nodebug=yes create_wrksrc=yes -hostmakedepends="perl flex" +hostmakedepends="perl flex gcc-ada libada-devel" makedepends="zlib-devel gmp-devel mpfr-devel libmpc-devel isl15-devel" -nostrip_files="libcaf_single.a libgcc.a libgcov.a libgcc_eh.a" +nostrip_files="libcaf_single.a libgcc.a libgcov.a libgcc_eh.a + libgnarl_pic.a libgnarl.a libgnat_pic.a libgnat.a" depends="${pkgname}-libc-${version}_${revision}" _apply_patch() { @@ -84,6 +84,7 @@ _gcc_bootstrap() { cd ${wrksrc}/gcc-${_gcc_version} _apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch + _apply_patch -p0 ${FILESDIR}/musl-ada.patch msg_normal "Building cross gcc bootstrap\n" @@ -165,7 +166,8 @@ _gcc_build() { _args+=" --target=${_triplet}" _args+=" --with-sysroot=${_sysroot}" _args+=" --libexecdir=/usr/lib" - _args+=" --enable-languages=c,c++,fortran,lto" + _args+=" --enable-languages=c,ada,c++,fortran,lto" + _args+=" --enable-libada" _args+=" --enable-lto" _args+=" --enable-default-pie" _args+=" --enable-default-ssp" @@ -245,6 +247,15 @@ do_install() { # Make ld-musl.so symlinks relative. ln -sf libc.so ${DESTDIR}/${_sysroot}/usr/lib/ld-musl-mips.so.1 + # symlinks for gnarl and gnat shared libraries + _majorver=${_gcc_version%.*.*} + _adalib=usr/lib/gcc/${_triplet}/${_gcc_version}/adalib + mv -v ${DESTDIR}/${_adalib}/libgnarl-${_majorver}.so ${DESTDIR}/${_sysroot}/usr/lib + mv -v ${DESTDIR}/${_adalib}/libgnat-${_majorver}.so ${DESTDIR}/${_sysroot}/usr/lib + ln -svf libgnarl-${_majorver}.so libgnarl.so + ln -svf libgnat-${_majorver}.so libgnat.so + rm -vf ${DESTDIR}/${_adalib}/libgna{rl,t}.so + # Remove unnecessary stuff rm -f ${DESTDIR}/usr/lib*/libiberty.a rm -rf ${DESTDIR}/usr/share