From ca5389331e6098fdce11d46ce96a34872897e197 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sat, 27 Jun 2015 08:24:11 +0200 Subject: [PATCH] cross-arm-linux-gnueabi: sync with other cross pkgs. Should resolve #1790 --- srcpkgs/cross-arm-linux-gnueabi/template | 66 +++++++++++------------- 1 file changed, 29 insertions(+), 37 deletions(-) diff --git a/srcpkgs/cross-arm-linux-gnueabi/template b/srcpkgs/cross-arm-linux-gnueabi/template index 600282c83b5..d9777d830f0 100644 --- a/srcpkgs/cross-arm-linux-gnueabi/template +++ b/srcpkgs/cross-arm-linux-gnueabi/template @@ -8,7 +8,7 @@ _linux_version=3.10.6 _triplet=arm-linux-gnueabi _fpuflags="--with-arch=armv5te --without-fp --with-float=soft" _archflags="-march=armv5te -msoft-float -mfloat-abi=soft" -_CROSS_SYSROOT="/usr/${_triplet}" +_sysroot="/usr/${_triplet}" pkgname=cross-${_triplet} version=0.20 @@ -57,7 +57,7 @@ _linux_headers() { cd linux-${_linux_version} make ARCH=arm headers_check - make ARCH=arm INSTALL_HDR_PATH=${_CROSS_SYSROOT}/usr headers_install + make ARCH=arm INSTALL_HDR_PATH=${_sysroot}/usr headers_install touch ${wrksrc}/.linux_build_done } @@ -72,7 +72,7 @@ _binutils_build() { ../binutils-${_binutils_version}/configure \ --prefix=/usr --target=${_triplet} \ - --with-sysroot=${_CROSS_SYSROOT} --disable-nls --disable-shared \ + --with-sysroot=${_sysroot} --disable-nls --disable-shared \ --disable-multilib --disable-werror make configure-host @@ -126,12 +126,12 @@ _glibc_headers() { ../glibc-${_glibc_version}/configure \ --host=${_triplet} --prefix=/usr \ - --with-headers=${_CROSS_SYSROOT}/usr/include \ + --with-headers=${_sysroot}/usr/include \ --config-cache --enable-obsolete-rpc \ --enable-kernel=2.6.27 ${_fpuflags} make -k install-headers cross_compiling=yes \ - install_root=${_CROSS_SYSROOT} + install_root=${_sysroot} touch ${wrksrc}/.glibc_headers_done } @@ -154,12 +154,12 @@ _glibc_build() { ../glibc-${_glibc_version}/configure \ --host=${_triplet} --prefix=/usr \ - --with-headers=${_CROSS_SYSROOT}/usr/include \ + --with-headers=${_sysroot}/usr/include \ --config-cache --disable-profile --enable-obsolete-rpc \ --disable-werror --enable-kernel=2.6.27 ${_fpuflags} make ${makejobs} - make install_root=${_CROSS_SYSROOT} install + make install_root=${_sysroot} install touch ${wrksrc}/.glibc_build_done } @@ -178,14 +178,14 @@ _gcc_build() { # Make this link to target libs. if [ ! -f .sed_subst_done ]; then - sed -e "s, /lib/, ${_CROSS_SYSROOT}/lib/,g;s, /usr/lib/, ${_CROSS_SYSROOT}/usr/lib/,g" \ - -i ${_CROSS_SYSROOT}/lib/libc.so ${_CROSS_SYSROOT}/lib/libpthread.so + sed -e "s, /lib/, ${_sysroot}/lib/,g;s, /usr/lib/, ${_sysroot}/usr/lib/,g" \ + -i ${_sysroot}/lib/libc.so ${_sysroot}/lib/libpthread.so touch .sed_subst_done fi ../gcc-${_gcc_version}/configure \ --target=${_triplet} --prefix=/usr --libdir=/usr/lib \ - --libexecdir=/usr/lib --with-sysroot=${_CROSS_SYSROOT} \ + --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 \ @@ -205,11 +205,11 @@ _gcc_build() { do_build() { for f in include lib bin; 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 # Ensure we use sane environment @@ -227,12 +227,12 @@ do_build() { do_install() { for f in include lib bin; 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 @@ -245,38 +245,30 @@ do_install() { # install linux API headers for MIPS cd ${wrksrc}/linux-${_linux_version} - make ARCH=arm 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 + make ARCH=arm 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}/${_CROSS_SYSROOT} install install-headers + make install_root=${DESTDIR}/${_sysroot} install install-headers # Remove unnecessary stuff rm -f ${DESTDIR}/usr/lib*/libiberty.a rm -rf ${DESTDIR}/usr/share - rm -rf ${DESTDIR}/${_CROSS_SYSROOT}/{sbin,etc,var} - rm -rf ${DESTDIR}/${_CROSS_SYSROOT}/usr/{sbin,share,libexec} - rm -rf ${DESTDIR}/${_CROSS_SYSROOT}/usr/lib/gconv - rm -f ${DESTDIR}/${_CROSS_SYSROOT}/libexec - - for f in sprof localedef gencat pldd sotruss tzselect iconv mtrace \ - catchsegv xtrace makedb pcprofiledump locale rpcgen getconf \ - getent ldd; do - rm -f ${DESTDIR}/${_CROSS_SYSROOT}/usr/bin/${f} - done - # remove temporary symlinks in sysroot - find ${DESTDIR}/${_CROSS_SYSROOT} -maxdepth 1 -type l -delete + rm -rf ${DESTDIR}/${_sysroot}/{sbin,bin,lib,etc,var} + rm -rf ${DESTDIR}/${_sysroot}/usr/{sbin,share,libexec} + rm -rf ${DESTDIR}/${_sysroot}/usr/lib/gconv + rm -f ${DESTDIR}/${_sysroot}/libexec } cross-arm-linux-gnueabi-libc_package() { short_desc+=" - glibc files" noarch=yes - nostrip=yes + noshlibprovides=yes noverifyrdeps=yes pkg_install() { - vmove usr/${_triplet} + vmove ${_sysroot} } }