diff --git a/common/cross-profiles/armv7hf.sh b/common/cross-profiles/armv7hf.sh index ebe274fe5d..f2999a4668 100644 --- a/common/cross-profiles/armv7hf.sh +++ b/common/cross-profiles/armv7hf.sh @@ -1,6 +1,6 @@ # Cross build profile for ARMv7 GNU EABI Hard Float. XBPS_TARGET_ARCH="armv7l" -XBPS_CROSS_TRIPLET="arm-linux-gnueabihf7" +XBPS_CROSS_TRIPLET="armv7l-linux-gnueabihf" XBPS_CROSS_CFLAGS="-march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard" XBPS_CROSS_CXXFLAGS="$XBPS_CROSS_CFLAGS" diff --git a/srcpkgs/cross-arm-linux-gnueabihf7-libc b/srcpkgs/cross-arm-linux-gnueabihf7-libc deleted file mode 120000 index 91475a64be..0000000000 --- a/srcpkgs/cross-arm-linux-gnueabihf7-libc +++ /dev/null @@ -1 +0,0 @@ -cross-arm-linux-gnueabihf7 \ No newline at end of file diff --git a/srcpkgs/cross-armv7l-linux-gnueabihf-libc b/srcpkgs/cross-armv7l-linux-gnueabihf-libc new file mode 120000 index 0000000000..3833a4b58b --- /dev/null +++ b/srcpkgs/cross-armv7l-linux-gnueabihf-libc @@ -0,0 +1 @@ +cross-armv7l-linux-gnueabihf \ No newline at end of file diff --git a/srcpkgs/cross-arm-linux-gnueabihf7/template b/srcpkgs/cross-armv7l-linux-gnueabihf/template similarity index 75% rename from srcpkgs/cross-arm-linux-gnueabihf7/template rename to srcpkgs/cross-armv7l-linux-gnueabihf/template index 7c81ed1f99..7118fb0917 100644 --- a/srcpkgs/cross-arm-linux-gnueabihf7/template +++ b/srcpkgs/cross-armv7l-linux-gnueabihf/template @@ -1,18 +1,18 @@ -# Template build file for 'cross-arm-linux-gnueabihf7' +# Template build file for 'cross-armv7l-linux-gnueabihf' # _binutils_version=2.25 _gcc_version=4.9.2 _glibc_version=2.21 -_linux_version=3.10.6 +_linux_version=3.18.5 -_triplet=arm-linux-gnueabihf7 +_triplet=armv7l-linux-gnueabihf _fpuflags="--with-arch=armv7-a --with-fpu=vfpv3 --with-float=hard" _archflags="-march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard" -_CROSS_SYSROOT="/usr/${_triplet}" +_sysroot="/usr/${_triplet}" pkgname=cross-${_triplet} version=0.19 -revision=3 +revision=1 short_desc="GNU Cross toolchain for the ${_triplet} LE target (binutils/gcc/glibc)" maintainer="Juan RP " homepage="http://www.voidlinux.eu" @@ -26,7 +26,7 @@ checksum=" 22defc65cfa3ef2a3395faaea75d6331c6e62ea5dfacfed3e2ec17b08c882923 2020c98295856aa13fda0f2f3a4794490757fc24bcca918d52cc8b4917b972dd aeeb362437965a5d3f40b151094ca79def04a115bd363fdd4a9a0c69482923b8 - ed4dfd9f56b7c82e9c71331bbf8d2ea01ddfddc1b6209bd3f3c8640aa24065cf" + e4442436e59c74169e98d38d2e2a434c7b73f8eda0aa8f20e454eaf52270fc90" lib32disabled=yes nocross=yes @@ -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,32 +245,29 @@ 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 - # 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-gnueabihf7-libc_package() { +cross-armv7l-linux-gnueabihf-libc_package() { short_desc+=" - glibc files" noarch=yes - nostrip=yes + noshlibprovides=yes noverifyrdeps=yes - pkg_install() { - vmove usr/${_triplet} + vmove ${_sysroot} } }