From 0ca8090799219cced3d743c3666f67c64f230c8b Mon Sep 17 00:00:00 2001 From: q66 Date: Fri, 25 Dec 2020 22:51:01 +0100 Subject: [PATCH] cross-i686-pc-linux-gnu: rework with void-cross --- srcpkgs/cross-i686-pc-linux-gnu/template | 358 +---------------------- 1 file changed, 15 insertions(+), 343 deletions(-) diff --git a/srcpkgs/cross-i686-pc-linux-gnu/template b/srcpkgs/cross-i686-pc-linux-gnu/template index 056d2553040..7500d9dad73 100644 --- a/srcpkgs/cross-i686-pc-linux-gnu/template +++ b/srcpkgs/cross-i686-pc-linux-gnu/template @@ -1,21 +1,20 @@ -# Template build file for 'cross-i686-pc-linux-gnu' -# +# Template file for 'cross-i686-pc-linux-gnu' +_triplet=i686-pc-linux-gnu _binutils_version=2.32 _gcc_version=9.3.0 _glibc_version=2.30 _linux_version=4.19 - -_triplet=i686-pc-linux-gnu -_archflags="-march=i686 -mtune=generic" -_sysroot="/usr/${_triplet}" - pkgname=cross-${_triplet} version=0.33 revision=4 -short_desc="GNU Cross toolchain for the ${_triplet} target (binutils/gcc/glibc)" +build_style=void-cross +hostmakedepends="tar gcc-objc gcc-go flex perl python3" +makedepends="isl15-devel libmpc-devel zlib-devel gmp-devel mpfr-devel" +depends="${pkgname}-libc-${version}_${revision}" +short_desc="Void cross toolchain for ${_triplet}" maintainer="Jürgen Buchmüller " -homepage="https://www.voidlinux.org/" license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later" +homepage="https://www.voidlinux.org/" distfiles=" ${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz @@ -25,352 +24,25 @@ checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04 71e197867611f6054aa1119b13a0c0abac12834765fe2d81f35ac57f84f742d1 e2c4114e569afbe7edbc29131a43be833850ab9a459d81beb2588016d2bbb8af 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1" - nocross=yes -nopie=yes -nodebug=yes -lib32disabled=yes -create_wrksrc=yes -hostmakedepends="tar gcc-objc gcc-go flex perl python3" -makedepends="isl15-devel libmpc-devel zlib-devel" -depends="${pkgname}-libc-${version}_${revision}" -nostrip_files="libcaf_single.a libgcc.a libgcov.a libgcc_eh.a - libgnarl_pic.a libgnarl.a libgnat_pic.a libgnat.a libgmem.a" -if [ "$XBPS_TARGET_LIBC" != "glibc" ]; then - broken="glibc crosstoolchain only available on glibc" -fi +cross_triplet=${_triplet} +cross_linux_arch=x86 +# explicitly enable for final gcc, as gfortran does not build without on x86 +cross_gcc_configure_args="--enable-libquadmath" +cross_glibc_cflags="-O2 -Wno-error -march=i686 -mtune=generic" if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then broken="Can't build crosstoolchain to itself" fi -_apply_patch() { - local args="$1" pname="$(basename $2)" - - if [ ! -f ".${pname}_done" ]; then - patch -N $args -i $2 - touch .${pname}_done - fi -} - -_binutils_build() { - local _args - - [ -f ${wrksrc}/.binutils_build_done ] && return 0 - - cd ${wrksrc}/binutils-${_binutils_version} - - msg_normal "Building cross binutils bootstrap\n" - - [ ! -d ../binutils-build ] && mkdir ../binutils-build - cd ../binutils-build - _args="--prefix=/usr" - _args+=" --target=${_triplet}" - _args+=" --with-sysroot=${_sysroot}" - _args+=" --disable-nls" - _args+=" --disable-shared" - _args+=" --disable-multilib" - _args+=" --disable-werror" - _args+=" --with-system-zlib" - - ../binutils-${_binutils_version}/configure ${_args} - - make configure-host && make ${makejobs} - make install - - touch ${wrksrc}/.binutils_build_done -} - -_gcc_bootstrap() { - local _args - [ -f ${wrksrc}/.gcc_bootstrap_done ] && return 0 - - cd ${wrksrc}/gcc-${_gcc_version} - for f in ${XBPS_SRCPKGDIR}/gcc/patches/*.patch; do - _apply_patch -p0 "$f" - done - - msg_normal "Building cross gcc bootstrap\n" - - [ ! -d ../gcc-bootstrap ] && mkdir ../gcc-bootstrap - cd ../gcc-bootstrap - - # Fix https://build.voidlinux.org/builders/x86_64_builder/builds/24895/steps/shell_3/logs/stdio - export gcc_cv_libc_provides_ssp=yes - _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 ${_args} - - make ${makejobs} - make install - - touch ${wrksrc}/.gcc_bootstrap_done -} - -_linux_headers() { - [ -f ${wrksrc}/.linux_build_done ] && return 0 - - cd ${wrksrc} - msg_normal "Building Linux API headers for x86\n" - - cd linux-${_linux_version} - - make ARCH=x86 headers_check - make ARCH=x86 INSTALL_HDR_PATH=${_sysroot}/usr headers_install - - touch ${wrksrc}/.linux_build_done -} - -_glibc_headers() { - local _args f - [ -f ${wrksrc}/.glibc_headers_done ] && return 0 - - cd ${wrksrc}/glibc-${_glibc_version} - if [ -d "${XBPS_SRCPKGDIR}/glibc/patches" ]; then - for f in ${XBPS_SRCPKGDIR}/glibc/patches/*.patch; do - _apply_patch -p1 "$f" - done - fi - - cd ${wrksrc} - msg_normal "Building cross glibc headers\n" - - [ ! -d glibc-headers ] && mkdir glibc-headers - cd glibc-headers - - echo "libc_cv_forced_unwind=yes" > config.cache - echo "libc_cv_c_cleanup=yes" >> config.cache - echo "libc_cv_ssp=no" >> config.cache - - export CC="${_triplet}-gcc" LD="${_triplet}-ld" \ - AS="${_triplet}-as" CPP="${_triplet}-cpp" - - _args="--host=${_triplet}" - _args+=" --prefix=/usr" - _args+=" --with-headers=${_sysroot}/usr/include" - _args+=" --config-cache" - _args+=" --enable-obsolete-rpc" - _args+=" --enable-obsolete-nsl" - _args+=" --enable-kernel=2.6.27" - _args+=" ${_fpuflags}" - - ../glibc-${_glibc_version}/configure ${_args} - - make -k install-headers cross_compiling=yes \ - install_root=${_sysroot} - - touch ${wrksrc}/.glibc_headers_done -} - -_glibc_build() { - local _args - [ -f ${wrksrc}/.glibc_build_done ] && return 0 - - cd ${wrksrc} - msg_normal "Building cross glibc\n" - - [ ! -d glibc-build ] && mkdir glibc-build - cd glibc-build - - echo "slibdir=/usr/lib32" > configparms - - echo "libc_cv_forced_unwind=yes" > config.cache - echo "libc_cv_c_cleanup=yes" >> config.cache - echo "libc_cv_ssp=no" >> config.cache - - export CC="${_triplet}-gcc" LD="${_triplet}-ld" \ - AS="${_triplet}-as" CPP="${_triplet}-cpp" - export CFLAGS="-O2 -pipe -Wno-error ${_archflags}" - _args="--host=${_triplet}" - _args+=" --prefix=/usr" - _args+=" --libdir=/usr/lib32" - _args+=" --with-headers=${_sysroot}/usr/include" - _args+=" --config-cache" - _args+=" --enable-obsolete-rpc" - _args+=" --enable-obsolete-nsl" - _args+=" --enable-kernel=2.6.27" - _args+=" ${_fpuflags}" - - ../glibc-${_glibc_version}/configure ${_args} - - make ${makejobs} - make install_root=${_sysroot} install - - touch ${wrksrc}/.glibc_build_done -} - -_gcc_build() { - local _args - - [ -f ${wrksrc}/.gcc_build_done ] && return 0 - - cd ${wrksrc} - msg_normal "Building cross gcc final\n" - - [ ! -d gcc-build ] && mkdir gcc-build - cd gcc-build - - unset LD AS CPP - - # Make this link to target libs. - if [ ! -f .sed_subst_done ]; then - sed -e "s, /lib/, ${_sysroot}/lib/,g;s, /usr/lib/, ${_sysroot}/usr/lib/,g" \ - -i ${_sysroot}/lib/libc.so - sed -e "s, /lib32/, ${_sysroot}/lib32/,g;s, /usr/lib32/, ${_sysroot}/usr/lib32/,g" \ - -i ${_sysroot}/lib/libc.so - touch .sed_subst_done - fi - _args="--target=${_triplet}" - _args+=" --target=${_triplet}" - _args+=" --prefix=/usr" - _args+=" --libexecdir=/usr/lib" - _args+=" --with-sysroot=${_sysroot}" - _args+=" --enable-languages=c,ada,c++,objc,obj-c++,go,fortran,lto" - _args+=" --with-gnu-as" - _args+=" --with-gnu-ld" - _args+=" --disable-multilib" - _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-libada" - _args+=" --enable-lto" - _args+=" --enable-default-pie" - _args+=" --enable-default-ssp" - _args+=" --enable-gnu-indirect-function" - _args+=" --enable-libquadmath" - _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}" - - CC="gcc" CFLAGS="-O2 -pipe" \ - ../gcc-${_gcc_version}/configure ${_args} - - make ${makejobs} - - touch ${wrksrc}/.gcc_build_done -} - -do_build() { - # Ensure we use sane environment - unset CC CXX CPP LD AS AR RANLIB OBJDUMP READELF NM - unset CFLAGS CXXFLAGS CPPFLAGS LDFLAGS - export CFLAGS="-Os" CXXFLAGS="-Os" - - for f in include lib libexec bin sbin; do - if [ ! -d ${_sysroot}/usr/${f} ]; then - mkdir -p ${_sysroot}/usr/${f} - fi - if [ ! -h ${_sysroot}/${f} ]; then - ln -sfr ${_sysroot}/usr/${f} ${_sysroot}/${f} - fi - done - ln -sf lib ${_sysroot}/usr/lib32 - ln -sf usr/lib ${_sysroot}/lib32 - - _binutils_build - _gcc_bootstrap - _linux_headers - _glibc_headers - _glibc_build - _gcc_build -} - -do_install() { - for f in include lib libexec bin sbin; do - if [ ! -d ${DESTDIR}/${_sysroot}/usr/${f} ]; then - mkdir -p ${DESTDIR}/${_sysroot}/usr/${f} - fi - if [ ! -h ${DESTDIR}/${_sysroot}/${f} ]; then - ln -sfr ${DESTDIR}/${_sysroot}/usr/${f} \ - ${DESTDIR}/${_sysroot}/${f} - fi - done - ln -sf lib ${DESTDIR}/${_sysroot}/usr/lib32 - ln -sf usr/lib ${DESTDIR}/${_sysroot}/lib32 - - # install cross binutils - cd ${wrksrc}/binutils-build - make DESTDIR=${DESTDIR} install - - # install cross gcc - cd ${wrksrc}/gcc-build - make DESTDIR=${DESTDIR} install - - # move libcc1.so* to the sysroot - mv ${DESTDIR}/usr/lib/libcc1.so* ${DESTDIR}/${_sysroot}/usr/lib - - # install linux API headers for x86. - cd ${wrksrc}/linux-${_linux_version} - make ARCH=x86 INSTALL_HDR_PATH=${DESTDIR}/${_sysroot}/usr headers_install - - rm -f $(find ${DESTDIR}/${_sysroot}/usr/include -name .install -or -name ..install.cmd) - rm -rf ${DESTDIR}/${_sysroot}/usr/include/drm - - # install glibc for target - cd ${wrksrc}/glibc-build - make install_root=${DESTDIR}/${_sysroot} install install-headers - - # 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 - - # We need to build libatomic in target gcc as gccgo needs it to - # build... but it's not needed at runtime, so remove it from the - # destdir so it doesn't conflict with the libatomic package - rm -f ${DESTDIR}/${_sysroot}/usr/lib/libatomic.* - - # Remove unnecessary stuff - rm -f ${DESTDIR}/usr/lib*/libiberty.a - rm -rf ${DESTDIR}/usr/share - rm -rf ${DESTDIR}/${_sysroot}/{sbin,lib,etc,var} - rm -rf ${DESTDIR}/${_sysroot}/usr/{sbin,share,libexec} - rm -f ${DESTDIR}/${_sysroot}/libexec -} - cross-i686-pc-linux-gnu-libc_package() { short_desc+=" - glibc files" nostrip=yes noverifyrdeps=yes noshlibprovides=yes + pkg_install() { - vmove ${_sysroot} + vmove usr/${cross_triplet} } }