From 6751bcd379640058cff8fd7cf35484b749128e45 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 7 Jan 2014 17:05:23 +0100 Subject: [PATCH] cross-i686-linux-musl: update toolchain. --- .../files/binutils-2.22-musl.diff | 18 --- srcpkgs/cross-i686-linux-musl/template | 143 ++++++++---------- 2 files changed, 63 insertions(+), 98 deletions(-) delete mode 100644 srcpkgs/cross-i686-linux-musl/files/binutils-2.22-musl.diff diff --git a/srcpkgs/cross-i686-linux-musl/files/binutils-2.22-musl.diff b/srcpkgs/cross-i686-linux-musl/files/binutils-2.22-musl.diff deleted file mode 100644 index 68286559a3..0000000000 --- a/srcpkgs/cross-i686-linux-musl/files/binutils-2.22-musl.diff +++ /dev/null @@ -1,18 +0,0 @@ ---- config.sub Wed Nov 21 20:06:14 2012 -0500 -+++ config.sub Wed Nov 21 20:07:23 2012 -0500 -@@ -125,6 +125,7 @@ - maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` - case $maybe_os in - nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ -+ linux-musl* | \ - linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ - knetbsd*-gnu* | netbsd*-gnu* | \ - kopensolaris*-gnu* | \ -@@ -1335,6 +1336,7 @@ - | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -linux-android* \ - | -linux-newlib* | -linux-uclibc* \ -+ | -linux-musl* \ - | -uxpv* | -beos* | -mpeix* | -udk* \ - | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ - | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ diff --git a/srcpkgs/cross-i686-linux-musl/template b/srcpkgs/cross-i686-linux-musl/template index c09e56c15d..d643a22598 100644 --- a/srcpkgs/cross-i686-linux-musl/template +++ b/srcpkgs/cross-i686-linux-musl/template @@ -1,17 +1,15 @@ -# Template build file for 'cross-arm-linux-musleabi' +# Template build file for 'cross-i686-linux-musl' # -_binutils_version=2.23.1 +_binutils_version=2.24 _gcc_version=4.7.3 -_musl_version=0.9.10 -_gmp_version=5.0.5 -_mpfr_version=3.1.1 -_mpc_version=0.9 -_linux_version=3.7.1 +_musl_version=0.9.15 +_linux_version=3.10.6 _triplet=i686-linux-musl +_sysroot="/usr/${_triplet}" pkgname=cross-${_triplet} -version=0.2 +version=0.3 revision=1 short_desc="Cross toolchain for the ${_triplet} target" maintainer="Juan RP " @@ -20,32 +18,20 @@ license="Public Domain" 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 - http://mirrors.kernel.org/gnu/gmp/gmp-${_gmp_version}.tar.bz2 - http://www.mpfr.org/mpfr-current/mpfr-${_mpfr_version}.tar.bz2 - http://www.multiprecision.org/mpc/download/mpc-${_mpc_version}.tar.gz http://www.kernel.org/pub/linux/kernel/v3.x/linux-${_linux_version}.tar.xz http://www.musl-libc.org/releases/musl-${_musl_version}.tar.gz" checksum=" - 2ab2e5b03e086d12c6295f831adad46b3e1410a3a234933a2e8fac66cb2e7a19 + e5e8c5be9664e7f7f96e0d09919110ab5ad597794f5b1809871177a0f0f14137 2f7c37eb4fc14422ff2358a9ef59c974a75ab41204ef0e49fc34ab1d8981a9c3 - 1f588aaccc41bb9aed946f9fe38521c26d8b290d003c5df807f65690f2aadec9 - 7b66c3f13dc8385f08264c805853f3e1a8eedab8071d582f3e661971c9acd5fd - fd3efe422f0d454592059e80f2c00d1a2e381bf2beda424c5094abd4deb049ac - e1ca8b8376ebdf797357f5f1734ed6eed3cadc16c32d280a780f150372de7255 - 71fc00733a3ee45fab342870ccd84d33d079e64f2d6fdcfb8b463a769c3ff391" + ed4dfd9f56b7c82e9c71331bbf8d2ea01ddfddc1b6209bd3f3c8640aa24065cf + 4a7baab8f295511196dee48d33b8b82a159a81233facb89433707c792033cbe7" create_wrksrc=yes hostmakedepends="perl flex" +makedepends="libfl-devel zlib-devel gmp-devel mpfr-devel libmpc-devel" nostrip_files="libgcc.a libgcov.a libgcc_eh.a" depends="${pkgname}-libc-${version}_${revision}" -if [ "$CROSS_BUILD" ]; then - makedepends="libfl-devel" -fi - -_CROSS_TARGET=${_triplet} -_CROSS_SYSROOT="/usr/${_CROSS_TARGET}" - _apply_patch() { local pname="$(basename $1)" @@ -58,20 +44,19 @@ _apply_patch() { _binutils_build() { [ -f ${wrksrc}/.binutils_build_done ] && return 0 - cd ${wrksrc}/binutils-${_binutils_version} - _apply_patch ${FILESDIR}/binutils-2.22-musl.diff - + cd ${wrksrc} msg_normal "Building cross binutils bootstrap\n" - [ ! -d ../binutils-build ] && mkdir ../binutils-build - cd ../binutils-build + [ ! -d binutils-build ] && mkdir binutils-build + cd binutils-build ../binutils-${_binutils_version}/configure \ - --prefix=/usr --target=${_CROSS_TARGET} \ + --prefix=/usr --target=${_triplet} --with-sysroot=${_sysroot} \ --disable-nls --disable-multilib --disable-werror \ --disable-shared ${_fpuflags} - make configure-host && make ${makejobs} + make configure-host + make ${makejobs} make install touch ${wrksrc}/.binutils_build_done @@ -88,18 +73,8 @@ _gcc_bootstrap() { [ ! -d ../gcc-bootstrap ] && mkdir ../gcc-bootstrap cd ../gcc-bootstrap - if [ ! -d ${wrksrc}/gcc-${_gcc_version}/gmp ]; then - mv ${wrksrc}/gmp-${_gmp_version} ${wrksrc}/gcc-${_gcc_version}/gmp - fi - if [ ! -d ${wrksrc}/gcc-${_gcc_version}/mpfr ]; then - mv ${wrksrc}/mpfr-${_mpfr_version} ${wrksrc}/gcc-${_gcc_version}/mpfr - fi - if [ ! -d ${wrksrc}/gcc-${_gcc_version}/mpc ]; then - mv ${wrksrc}/mpc-${_mpc_version} ${wrksrc}/gcc-${_gcc_version}/mpc - fi - ../gcc-${_gcc_version}/configure --prefix=/usr \ - --target=${_CROSS_TARGET} --with-newlib \ + --target=${_triplet} --with-sysroot=${_sysroot} --with-newlib \ --disable-nls --disable-shared --disable-multilib \ --disable-decimal-float --disable-libgomp --disable-libmudflap \ --disable-libquadmath --disable-libssp --disable-threads \ @@ -115,12 +90,12 @@ _linux_headers() { [ -f ${wrksrc}/.linux_build_done ] && return 0 cd ${wrksrc} - msg_normal "Building Linux API headers for ARM\n" + msg_normal "Building Linux API headers\n" cd linux-${_linux_version} make ARCH=x86 headers_check - make ARCH=x86 INSTALL_HDR_PATH=${_CROSS_SYSROOT}/usr headers_install + make ARCH=x86 INSTALL_HDR_PATH=${_sysroot}/usr headers_install touch ${wrksrc}/.linux_build_done } @@ -131,11 +106,11 @@ _musl_build() { cd ${wrksrc}/musl-${_musl_version} msg_normal "Building cross musl libc\n" - CC="${_CROSS_TARGET}-gcc" CFLAGS="-Os -pipe ${_archflags}" \ + CC="${_triplet}-gcc" CFLAGS="-Os -pipe ${_archflags}" \ ./configure --prefix=/usr \ make ${makejobs} - make DESTDIR=${_CROSS_SYSROOT} install + make DESTDIR=${_sysroot} install touch ${wrksrc}/.musl_build_done } @@ -150,8 +125,8 @@ _gcc_build() { cd gcc-build ../gcc-${_gcc_version}/configure \ - --target=${_CROSS_TARGET} --prefix=/usr \ - --enable-languages=c,c++ \ + --target=${_triplet} --with-sysroot=${_sysroot} --prefix=/usr \ + --enable-languages=c,c++,lto --enable-lto \ --disable-multilib --disable-nls --disable-libquadmath \ --disable-libmudflap --enable-c99 --enable-shared \ --enable-long-long --enable-threads=posix \ @@ -169,11 +144,11 @@ do_build() { export CFLAGS="-Os -pipe" CXXFLAGS="-Os -pipe" for f in include lib libexec bin sbin; do - if [ ! -d ${_CROSS_SYSROOT}/usr/${f} ]; then - mkdir -p ${_CROSS_SYSROOT}/usr/${f} + if [ ! -d ${_sysroot}/usr/${f} ]; then + mkdir -p ${_sysroot}/usr/${f} fi - if [ ! -h ${_CROSS_SYSROOT}/${f} ]; then - ln -sfr ${_CROSS_SYSROOT}/usr/${f} ${_CROSS_SYSROOT}/${f} + if [ ! -h ${_sysroot}/${f} ]; then + ln -sfr ${_sysroot}/usr/${f} ${_sysroot}/${f} fi done @@ -186,55 +161,61 @@ do_build() { do_install() { for f in include lib libexec bin sbin; do - if [ ! -d ${DESTDIR}/${_CROSS_SYSROOT}/usr/${f} ]; then - mkdir -p ${DESTDIR}/${_CROSS_SYSROOT}/usr/${f} + if [ ! -d ${DESTDIR}/${_sysroot}/usr/${f} ]; then + mkdir -p ${DESTDIR}/${_sysroot}/usr/${f} fi - if [ ! -h ${DESTDIR}/${_CROSS_SYSROOT}/${f} ]; then - ln -sfr ${DESTDIR}/${_CROSS_SYSROOT}/usr/${f} \ - ${DESTDIR}/${_CROSS_SYSROOT}/${f} + if [ ! -h ${DESTDIR}/${_sysroot}/${f} ]; then + ln -sfr ${DESTDIR}/${_sysroot}/usr/${f} \ + ${DESTDIR}/${_sysroot}/${f} fi done # install cross binutils - cd ${wrksrc}/binutils-build && make DESTDIR=${DESTDIR} install + cd ${wrksrc}/binutils-build + make DESTDIR=${DESTDIR} install # install cross gcc - cd ${wrksrc}/gcc-build && make DESTDIR=${DESTDIR} install + cd ${wrksrc}/gcc-build + make DESTDIR=${DESTDIR} install # install musl libc for target - cd ${wrksrc}/musl-${_musl_version} && \ - make DESTDIR=${DESTDIR}/${_CROSS_SYSROOT} install + cd ${wrksrc}/musl-${_musl_version} + make DESTDIR=${DESTDIR}/${_sysroot} install # Remove useless headers. - rm -rf ${DESTDIR}/usr/lib/gcc/${_CROSS_TARGET}/*/include-fixed/ \ - ${DESTDIR}/usr/lib/gcc/${_CROSS_TARGET}/*/include/stddef.h + rm -rf ${DESTDIR}/usr/lib/gcc/${_triplet}/*/include-fixed/ \ + ${DESTDIR}/usr/lib/gcc/${_triplet}/*/include/stddef.h - # Make ld-musl-arm.so.1 symlink relative to cwd. - cd ${DESTDIR}/${_CROSS_SYSROOT}/usr/lib - ln -sf libc.so ld-musl-arm.so.1 + # Make ld-musl-i386.so.1 symlink relative to cwd. + cd ${DESTDIR}/${_sysroot}/usr/lib + ln -sf libc.so ld-musl-i386.so.1 # install linux API headers for x86 - cd ${wrksrc}/linux-${_linux_version} && \ - make ARCH=x86 INSTALL_HDR_PATH=${DESTDIR}/${_CROSS_SYSROOT}/usr \ - headers_install - rm -f $(find ${DESTDIR}/${_CROSS_SYSROOT}/usr/include -name .install -or -name ..install.cmd) - rm -rf ${DESTDIR}/${_CROSS_SYSROOT}/usr/include/drm + 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 + # Move files to /usr/lib (lib64). + if [ -d ${DESTDIR}/${_sysroot}/usr/lib64 ]; then + mv ${DESTDIR}/${_sysroot}/usr/lib64/* ${DESTDIR}/${_sysroot}/usr/lib/ + rmdir ${DESTDIR}/${_sysroot}/usr/lib64 + fi # Remove unnecessary stuff rm -f ${DESTDIR}/usr/lib*/libiberty.a rm -rf ${DESTDIR}/usr/share - rm -rf ${DESTDIR}/${_CROSS_SYSROOT}/{etc,var} - rm -rf ${DESTDIR}/${_CROSS_SYSROOT}/usr/{sbin,share,libexec} - rm -f ${DESTDIR}/${_CROSS_SYSROOT}/libexec - rm -f ${DESTDIR}/${_CROSS_SYSROOT}/lib/*.py + rm -rf ${DESTDIR}/${_sysroot}/{etc,var} + rm -rf ${DESTDIR}/${_sysroot}/usr/{sbin,share,libexec} + rm -f ${DESTDIR}/${_sysroot}/libexec + rm -f ${DESTDIR}/${_sysroot}/lib/*.py } do_clean() { # Remove temporary stuff from masterdir - rm -rf ${_CROSS_SYSROOT} - rm -f /usr/bin/${_CROSS_TARGET}* - rm -rf /usr/lib/gcc/${_CROSS_TARGET} - rm -rf /usr/libexec/gcc/${_CROSS_TARGET} + rm -rf ${_sysroot} + rm -f /usr/bin/${_triplet}* + rm -rf /usr/lib/gcc/${_triplet} + rm -rf /usr/libexec/gcc/${_triplet} } cross-i686-linux-musl-libc_package() { @@ -242,6 +223,8 @@ cross-i686-linux-musl-libc_package() { noarch=yes noverifydeps=yes pkg_install() { - vmove usr/${_CROSS_TARGET} + vmove usr/${_triplet} + mkdir -p ${DESTDIR}/usr/${_triplet}/usr/ + mv ${PKGDESTDIR}/usr/${_triplet}/usr/bin ${DESTDIR}/usr/${_triplet}/usr } }