diff --git a/srcpkgs/cross-i686-pc-linux-gnu/files/glibc-2.18-make-4.patch b/srcpkgs/cross-i686-pc-linux-gnu/files/glibc-2.18-make-4.patch new file mode 100644 index 00000000000..0a842b12dd7 --- /dev/null +++ b/srcpkgs/cross-i686-pc-linux-gnu/files/glibc-2.18-make-4.patch @@ -0,0 +1,45 @@ +From dc76f0c32dae689a08aa21a1d206d4cd62adb278 Mon Sep 17 00:00:00 2001 +From: Marc-Antoine Perennou +Date: Thu, 10 Oct 2013 14:26:12 +0900 +Subject: [PATCH] configure: allow building with GNU Make 4 + +Currently, configure errors telling make 4 is too old +since it does not match our regexp. + +configure.in: allow GNU Make 4.* + +Signed-off-by: Marc-Antoine Perennou +--- + configure | 2 +- + configure.in | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure b/configure +index 5e2f4d0..e139bf0 100755 +--- configure ++++ configure +@@ -4761,7 +4761,7 @@ $as_echo_n "checking version of $MAKE... " >&6; } + ac_prog_version=`$MAKE --version 2>&1 | sed -n 's/^.*GNU Make[^0-9]*\([0-9][0-9.]*\).*$/\1/p'` + case $ac_prog_version in + '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; +- 3.79* | 3.[89]*) ++ 3.79* | 3.[89]* | 4.*) + ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; + *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; + +diff --git a/configure.in b/configure.in +index a7f9881..95c36b6 100644 +--- configure.in ++++ configure.in +@@ -984,7 +984,7 @@ AC_CHECK_PROG_VER(CC, ${ac_tool_prefix}gcc ${ac_tool_prefix}cc, -v, + critic_missing="$critic_missing gcc") + AC_CHECK_PROG_VER(MAKE, gnumake gmake make, --version, + [GNU Make[^0-9]*\([0-9][0-9.]*\)], +- [3.79* | 3.[89]*], critic_missing="$critic_missing make") ++ [3.79* | 3.[89]* | 4.*], critic_missing="$critic_missing make") + + AC_CHECK_PROG_VER(MSGFMT, gnumsgfmt gmsgfmt msgfmt, --version, + [GNU gettext.* \([0-9]*\.[0-9.]*\)], +-- +1.8.4.1 + diff --git a/srcpkgs/cross-i686-pc-linux-gnu/template b/srcpkgs/cross-i686-pc-linux-gnu/template index da40ae5ad4b..7dbaa49fdfb 100644 --- a/srcpkgs/cross-i686-pc-linux-gnu/template +++ b/srcpkgs/cross-i686-pc-linux-gnu/template @@ -1,48 +1,47 @@ # Template build file for 'cross-i686-pc-linux-gnu' # -_binutils_version=2.23.1 +_binutils_version=2.24 _gcc_version=4.7.3 _glibc_version=2.18 -_gmp_version=5.0.5 -_mpfr_version=3.1.2 -_mpc_version=0.9 _linux_version=3.10.6 _triplet=i686-pc-linux-gnu _archflags="-march=i686 -mtune=generic" +_CROSS_SYSROOT="/usr/${_triplet}" pkgname=cross-${_triplet} -version=0.9 +version=0.10 revision=1 short_desc="GNU Cross toolchain for the ${_triplet} target (binutils/gcc/glibc)" -maintainer="Juan RP " +maintainer="Juan RP " homepage="http://www.voidlinux.eu" 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://ftp.gnu.org/gnu/glibc/glibc-${_glibc_version}.tar.xz - 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" checksum=" 2ab2e5b03e086d12c6295f831adad46b3e1410a3a234933a2e8fac66cb2e7a19 2f7c37eb4fc14422ff2358a9ef59c974a75ab41204ef0e49fc34ab1d8981a9c3 2cb4e1e381928f1e5e55e71ab1ba8e0ea7ede75ff9709770435bfd018ea257a3 - 1f588aaccc41bb9aed946f9fe38521c26d8b290d003c5df807f65690f2aadec9 - 79c73f60af010a30a5c27a955a1d2d01ba095b72537dab0ecaad57f5a7bb1b6b - fd3efe422f0d454592059e80f2c00d1a2e381bf2beda424c5094abd4deb049ac ed4dfd9f56b7c82e9c71331bbf8d2ea01ddfddc1b6209bd3f3c8640aa24065cf" only_for_archs="x86_64" create_wrksrc=yes -makedepends="perl flex" +hostmakedepends="perl flex" +makedepends="zlib-devel gmp-devel mpfr-devel libmpc-devel" depends="${pkgname}-libc-${version}_${revision}" nostrip_files="libgcc.a libgcov.a libgcc_eh.a" -_CROSS_TARGET=${_triplet} -_CROSS_SYSROOT="/usr/${_CROSS_TARGET}" +_apply_patch() { + local pname="$(basename $1)" + + if [ ! -f ".${pname}_done" ]; then + patch -Np1 -i ${1} + touch .${pname}_done + fi +} _binutils_build() { [ -f ${wrksrc}/.binutils_build_done ] && return 0 @@ -55,7 +54,7 @@ _binutils_build() { cd ../binutils-build ../binutils-${_binutils_version}/configure \ - --prefix=/usr --target=${_CROSS_TARGET} \ + --prefix=/usr --target=${_triplet} \ --with-sysroot=${_CROSS_SYSROOT} \ --disable-nls --disable-multilib --disable-werror \ --disable-shared ${_fpuflags} @@ -87,7 +86,7 @@ _gcc_bootstrap() { fi ../gcc-${_gcc_version}/configure --prefix=/usr \ - --target=${_CROSS_TARGET} --with-newlib \ + --target=${_triplet} --with-newlib \ --with-sysroot=${_CROSS_SYSROOT} \ --disable-nls --disable-shared --disable-multilib \ --disable-decimal-float --disable-libgomp --disable-libmudflap \ @@ -127,11 +126,11 @@ _glibc_headers() { echo "libc_cv_c_cleanup=yes" >> config.cache echo "libc_cv_ssp=no" >> config.cache - export CC="${_CROSS_TARGET}-gcc" LD="${_CROSS_TARGET}-ld" \ - AS="${_CROSS_TARGET}-as" CPP="${_CROSS_TARGET}-cpp" + export CC="${_triplet}-gcc" LD="${_triplet}-ld" \ + AS="${_triplet}-as" CPP="${_triplet}-cpp" ../glibc-${_glibc_version}/configure \ - --host=${_CROSS_TARGET} --prefix=/usr \ + --host=${_triplet} --prefix=/usr \ --with-headers=${_CROSS_SYSROOT}/usr/include \ --config-cache --enable-add-ons=nptl,ports \ --enable-obsolete-rpc \ @@ -156,12 +155,12 @@ _glibc_build() { echo "libc_cv_c_cleanup=yes" >> config.cache echo "libc_cv_ssp=no" >> config.cache - export CC="${_CROSS_TARGET}-gcc" LD="${_CROSS_TARGET}-ld" \ - AS="${_CROSS_TARGET}-as" CPP="${_CROSS_TARGET}-cpp" + export CC="${_triplet}-gcc" LD="${_triplet}-ld" \ + AS="${_triplet}-as" CPP="${_triplet}-cpp" export CFLAGS="-Os -pipe ${_archflags}" ../glibc-${_glibc_version}/configure \ - --host=${_CROSS_TARGET} --prefix=/usr \ + --host=${_triplet} --prefix=/usr \ --with-headers=${_CROSS_SYSROOT}/usr/include \ --config-cache --enable-add-ons=nptl,ports \ --enable-obsolete-rpc --disable-profile \ @@ -193,9 +192,9 @@ _gcc_build() { fi ../gcc-${_gcc_version}/configure \ - --target=${_CROSS_TARGET} --prefix=/usr \ + --target=${_triplet} --prefix=/usr \ --with-sysroot=${_CROSS_SYSROOT} \ - --enable-languages=c,c++ \ + --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 \ @@ -241,22 +240,23 @@ do_install() { 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 linux API headers for MIPS - cd ${wrksrc}/linux-${_linux_version} && \ - make ARCH=x86 INSTALL_HDR_PATH=${DESTDIR}/${_CROSS_SYSROOT}/usr \ - headers_install + # 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 # install glibc for target - cd ${wrksrc}/glibc-build && \ - make install_root=${DESTDIR}/${_CROSS_SYSROOT} install install-headers + cd ${wrksrc}/glibc-build + make install_root=${DESTDIR}/${_CROSS_SYSROOT} install install-headers # Remove unnecessary stuff rm -f ${DESTDIR}/usr/lib*/libiberty.a @@ -276,9 +276,9 @@ do_install() { 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 -f /usr/bin/${_triplet}* + rm -rf /usr/lib/gcc/${_triplet} + rm -rf /usr/libexec/gcc/${_triplet} } cross-i686-pc-linux-gnu-libc_package() { @@ -287,6 +287,6 @@ cross-i686-pc-linux-gnu-libc_package() { nostrip=yes noverifydeps=yes pkg_install() { - vmove usr/${_CROSS_TARGET} + vmove usr/${_triplet} } }