From 4a6213c1e3ba01d1605c14df43e6af3380fb6803 Mon Sep 17 00:00:00 2001 From: Christian Neukirchen Date: Mon, 25 Aug 2014 13:35:38 +0200 Subject: [PATCH] cross-*-gnu*: apply glibc-2.18-xattr-compat-hack.patch --- .../files/glibc-2.18-xattr-compat-hack.patch | 1 + srcpkgs/cross-arm-linux-gnueabi/template | 7 +++++-- .../files/glibc-2.18-xattr-compat-hack.patch | 1 + srcpkgs/cross-arm-linux-gnueabihf/template | 7 +++++-- .../files/glibc-2.18-xattr-compat-hack.patch | 1 + srcpkgs/cross-i686-pc-linux-gnu/template | 7 +++++-- .../files/glibc-2.18-xattr-compat-hack.patch | 1 + srcpkgs/cross-mips-softfloat-linux-gnu/template | 7 +++++-- .../files/glibc-2.18-xattr-compat-hack.patch | 1 + srcpkgs/cross-mipsel-softfloat-linux-gnu/template | 7 +++++-- 10 files changed, 30 insertions(+), 10 deletions(-) create mode 120000 srcpkgs/cross-arm-linux-gnueabi/files/glibc-2.18-xattr-compat-hack.patch create mode 120000 srcpkgs/cross-arm-linux-gnueabihf/files/glibc-2.18-xattr-compat-hack.patch create mode 120000 srcpkgs/cross-i686-pc-linux-gnu/files/glibc-2.18-xattr-compat-hack.patch create mode 120000 srcpkgs/cross-mips-softfloat-linux-gnu/files/glibc-2.18-xattr-compat-hack.patch create mode 120000 srcpkgs/cross-mipsel-softfloat-linux-gnu/files/glibc-2.18-xattr-compat-hack.patch diff --git a/srcpkgs/cross-arm-linux-gnueabi/files/glibc-2.18-xattr-compat-hack.patch b/srcpkgs/cross-arm-linux-gnueabi/files/glibc-2.18-xattr-compat-hack.patch new file mode 120000 index 00000000000..654126c0cf8 --- /dev/null +++ b/srcpkgs/cross-arm-linux-gnueabi/files/glibc-2.18-xattr-compat-hack.patch @@ -0,0 +1 @@ +../../glibc/patches/glibc-2.18-xattr-compat-hack.patch \ No newline at end of file diff --git a/srcpkgs/cross-arm-linux-gnueabi/template b/srcpkgs/cross-arm-linux-gnueabi/template index 461d26f8b1a..e89c7f76efd 100644 --- a/srcpkgs/cross-arm-linux-gnueabi/template +++ b/srcpkgs/cross-arm-linux-gnueabi/template @@ -11,7 +11,7 @@ _archflags="-march=armv5te -msoft-float -mfloat-abi=soft" _CROSS_SYSROOT="/usr/${_triplet}" pkgname=cross-${_triplet} -version=0.15 +version=0.16 revision=1 short_desc="GNU Cross toolchain for the ${_triplet} LE target (binutils/gcc/glibc)" maintainer="Juan RP " @@ -41,7 +41,7 @@ _apply_patch() { local pname="$(basename $1)" if [ ! -f ".${pname}_done" ]; then - patch -Np1 -i ${1} + patch -Np0 -i ${1} touch .${pname}_done fi } @@ -107,6 +107,9 @@ _gcc_bootstrap() { _glibc_headers() { [ -f ${wrksrc}/.glibc_headers_done ] && return 0 + cd ${wrksrc}/glibc-${_glibc_version} + _apply_patch ${FILESDIR}/glibc-2.18-xattr-compat-hack.patch + cd ${wrksrc} msg_normal "Building cross glibc headers\n" diff --git a/srcpkgs/cross-arm-linux-gnueabihf/files/glibc-2.18-xattr-compat-hack.patch b/srcpkgs/cross-arm-linux-gnueabihf/files/glibc-2.18-xattr-compat-hack.patch new file mode 120000 index 00000000000..654126c0cf8 --- /dev/null +++ b/srcpkgs/cross-arm-linux-gnueabihf/files/glibc-2.18-xattr-compat-hack.patch @@ -0,0 +1 @@ +../../glibc/patches/glibc-2.18-xattr-compat-hack.patch \ No newline at end of file diff --git a/srcpkgs/cross-arm-linux-gnueabihf/template b/srcpkgs/cross-arm-linux-gnueabihf/template index 6c1841c335d..d378d7d763c 100644 --- a/srcpkgs/cross-arm-linux-gnueabihf/template +++ b/srcpkgs/cross-arm-linux-gnueabihf/template @@ -11,7 +11,7 @@ _archflags="-march=armv6 -mfpu=vfp -mfloat-abi=hard" _CROSS_SYSROOT="/usr/${_triplet}" pkgname=cross-${_triplet} -version=0.17 +version=0.18 revision=1 short_desc="GNU Cross toolchain for the ${_triplet} LE target (binutils/gcc/glibc)" maintainer="Juan RP " @@ -41,7 +41,7 @@ _apply_patch() { local pname="$(basename $1)" if [ ! -f ".${pname}_done" ]; then - patch -Np1 -i ${1} + patch -Np0 -i ${1} touch .${pname}_done fi } @@ -108,6 +108,9 @@ _gcc_bootstrap() { _glibc_headers() { [ -f ${wrksrc}/.glibc_headers_done ] && return 0 + cd ${wrksrc}/glibc-${_glibc_version} + _apply_patch ${FILESDIR}/glibc-2.18-xattr-compat-hack.patch + cd ${wrksrc} msg_normal "Building cross glibc headers\n" diff --git a/srcpkgs/cross-i686-pc-linux-gnu/files/glibc-2.18-xattr-compat-hack.patch b/srcpkgs/cross-i686-pc-linux-gnu/files/glibc-2.18-xattr-compat-hack.patch new file mode 120000 index 00000000000..654126c0cf8 --- /dev/null +++ b/srcpkgs/cross-i686-pc-linux-gnu/files/glibc-2.18-xattr-compat-hack.patch @@ -0,0 +1 @@ +../../glibc/patches/glibc-2.18-xattr-compat-hack.patch \ No newline at end of file diff --git a/srcpkgs/cross-i686-pc-linux-gnu/template b/srcpkgs/cross-i686-pc-linux-gnu/template index bba2c34d80b..0c32d847fdf 100644 --- a/srcpkgs/cross-i686-pc-linux-gnu/template +++ b/srcpkgs/cross-i686-pc-linux-gnu/template @@ -10,7 +10,7 @@ _archflags="-march=i686 -mtune=generic" _CROSS_SYSROOT="/usr/${_triplet}" pkgname=cross-${_triplet} -version=0.15 +version=0.16 revision=1 short_desc="GNU Cross toolchain for the ${_triplet} target (binutils/gcc/glibc)" maintainer="Juan RP " @@ -40,7 +40,7 @@ _apply_patch() { local pname="$(basename $1)" if [ ! -f ".${pname}_done" ]; then - patch -Np1 -i ${1} + patch -Np0 -i ${1} touch .${pname}_done fi } @@ -108,6 +108,9 @@ _linux_headers() { _glibc_headers() { [ -f ${wrksrc}/.glibc_headers_done ] && return 0 + cd ${wrksrc}/glibc-${_glibc_version} + _apply_patch ${FILESDIR}/glibc-2.18-xattr-compat-hack.patch + cd ${wrksrc} msg_normal "Building cross glibc headers\n" diff --git a/srcpkgs/cross-mips-softfloat-linux-gnu/files/glibc-2.18-xattr-compat-hack.patch b/srcpkgs/cross-mips-softfloat-linux-gnu/files/glibc-2.18-xattr-compat-hack.patch new file mode 120000 index 00000000000..654126c0cf8 --- /dev/null +++ b/srcpkgs/cross-mips-softfloat-linux-gnu/files/glibc-2.18-xattr-compat-hack.patch @@ -0,0 +1 @@ +../../glibc/patches/glibc-2.18-xattr-compat-hack.patch \ No newline at end of file diff --git a/srcpkgs/cross-mips-softfloat-linux-gnu/template b/srcpkgs/cross-mips-softfloat-linux-gnu/template index fb62cd8eece..5af417bebcb 100644 --- a/srcpkgs/cross-mips-softfloat-linux-gnu/template +++ b/srcpkgs/cross-mips-softfloat-linux-gnu/template @@ -11,7 +11,7 @@ _archflags="-mtune=mips32r2 -mabi=32 -msoft-float" _CROSS_SYSROOT="/usr/${_triplet}" pkgname=cross-${_triplet} -version=0.15 +version=0.16 revision=1 short_desc="GNU Cross toolchain for the ${_triplet} BE target (binutils/gcc/glibc)" maintainer="Juan RP " @@ -40,7 +40,7 @@ _apply_patch() { local pname="$(basename $1)" if [ ! -f ".${pname}_done" ]; then - patch -Np1 -i ${1} + patch -Np0 -i ${1} touch .${pname}_done fi } @@ -106,6 +106,9 @@ _gcc_bootstrap() { _glibc_headers() { [ -f ${wrksrc}/.glibc_headers_done ] && return 0 + cd ${wrksrc}/glibc-${_glibc_version} + _apply_patch ${FILESDIR}/glibc-2.18-xattr-compat-hack.patch + cd ${wrksrc} msg_normal "Building cross glibc headers\n" diff --git a/srcpkgs/cross-mipsel-softfloat-linux-gnu/files/glibc-2.18-xattr-compat-hack.patch b/srcpkgs/cross-mipsel-softfloat-linux-gnu/files/glibc-2.18-xattr-compat-hack.patch new file mode 120000 index 00000000000..654126c0cf8 --- /dev/null +++ b/srcpkgs/cross-mipsel-softfloat-linux-gnu/files/glibc-2.18-xattr-compat-hack.patch @@ -0,0 +1 @@ +../../glibc/patches/glibc-2.18-xattr-compat-hack.patch \ No newline at end of file diff --git a/srcpkgs/cross-mipsel-softfloat-linux-gnu/template b/srcpkgs/cross-mipsel-softfloat-linux-gnu/template index 0727c31813b..14bf2b5e239 100644 --- a/srcpkgs/cross-mipsel-softfloat-linux-gnu/template +++ b/srcpkgs/cross-mipsel-softfloat-linux-gnu/template @@ -11,7 +11,7 @@ _archflags="-mtune=mips32r2 -mabi=32 -msoft-float" _CROSS_SYSROOT="/usr/${_triplet}" pkgname=cross-${_triplet} -version=0.15 +version=0.16 revision=1 short_desc="GNU Cross toolchain for the ${_triplet} LE target (binutils/gcc/glibc)" maintainer="Juan RP " @@ -40,7 +40,7 @@ _apply_patch() { local pname="$(basename $1)" if [ ! -f ".${pname}_done" ]; then - patch -Np1 -i ${1} + patch -Np0 -i ${1} touch .${pname}_done fi } @@ -106,6 +106,9 @@ _gcc_bootstrap() { _glibc_headers() { [ -f ${wrksrc}/.glibc_headers_done ] && return 0 + cd ${wrksrc}/glibc-${_glibc_version} + _apply_patch ${FILESDIR}/glibc-2.18-xattr-compat-hack.patch + cd ${wrksrc} msg_normal "Building cross glibc headers\n"