[arch-commits] Commit in lib32-glibc/repos (5 files)
Jan Steffens
heftig at nymeria.archlinux.org
Wed Apr 23 14:15:43 UTC 2014
Date: Wednesday, April 23, 2014 @ 16:15:43
Author: heftig
Revision: 110037
archrelease: copy trunk to multilib-staging-x86_64
Added:
lib32-glibc/repos/multilib-staging-x86_64/
lib32-glibc/repos/multilib-staging-x86_64/PKGBUILD
(from rev 110036, lib32-glibc/trunk/PKGBUILD)
lib32-glibc/repos/multilib-staging-x86_64/glibc-2.19-fix-sign-in-bsloww1-input.patch
(from rev 110036, lib32-glibc/trunk/glibc-2.19-fix-sign-in-bsloww1-input.patch)
lib32-glibc/repos/multilib-staging-x86_64/glibc-2.19-xattr_header.patch
(from rev 110036, lib32-glibc/trunk/glibc-2.19-xattr_header.patch)
lib32-glibc/repos/multilib-staging-x86_64/lib32-glibc.conf
(from rev 110036, lib32-glibc/trunk/lib32-glibc.conf)
--------------------------------------------+
PKGBUILD | 144 +++++++++++++++++++++++++++
glibc-2.19-fix-sign-in-bsloww1-input.patch | 71 +++++++++++++
glibc-2.19-xattr_header.patch | 42 +++++++
lib32-glibc.conf | 1
4 files changed, 258 insertions(+)
Copied: lib32-glibc/repos/multilib-staging-x86_64/PKGBUILD (from rev 110036, lib32-glibc/trunk/PKGBUILD)
===================================================================
--- multilib-staging-x86_64/PKGBUILD (rev 0)
+++ multilib-staging-x86_64/PKGBUILD 2014-04-23 14:15:43 UTC (rev 110037)
@@ -0,0 +1,144 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Contributor: Jan de Groot <jgc at archlinux.org>
+# Contributor: Allan McRae <allan at archlinux.org>
+
+# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
+# NOTE: valgrind requires rebuilt with each major glibc version
+
+_pkgbasename=glibc
+pkgname=lib32-$_pkgbasename
+pkgver=2.19
+pkgrel=4
+pkgdesc="GNU C Library for multilib"
+arch=('x86_64')
+url="http://www.gnu.org/software/libc"
+license=('GPL' 'LGPL')
+makedepends=('gcc-multilib>=4.7')
+options=('!strip' '!emptydirs' 'staticlibs')
+source=(http://ftp.gnu.org/gnu/libc/${_pkgbasename}-${pkgver}.tar.xz{,.sig}
+ glibc-2.19-xattr_header.patch
+ glibc-2.19-fix-sign-in-bsloww1-input.patch
+ lib32-glibc.conf)
+md5sums=('e26b8cc666b162f999404b03970f14e4'
+ 'SKIP'
+ '39a4876837789e07746f1d84cd8cb46a'
+ '755a1a9d7844a5e338eddaa9a5d974cd'
+ '6e052f1cb693d5d3203f50f9d4e8c33b')
+
+prepare() {
+ cd ${srcdir}/${_pkgbasename}-${pkgver}
+
+ # fix for {linux,sys}/xattr.h incompatibility - commit fdbe8eae
+ patch -p1 -i $srcdir/glibc-2.19-xattr_header.patch
+
+ # fix issues in sin/cos slow path calculation - commit ffe768a9
+ patch -p1 -i $srcdir/glibc-2.19-fix-sign-in-bsloww1-input.patch
+
+ mkdir ${srcdir}/glibc-build
+}
+
+build() {
+ cd ${srcdir}/glibc-build
+
+ #if [[ ${CARCH} = "i686" ]]; then
+ # Hack to fix NPTL issues with Xen, only required on 32bit platforms
+ # TODO: make separate glibc-xen package for i686
+ export CFLAGS="${CFLAGS} -mno-tls-direct-seg-refs"
+ #fi
+
+ echo "slibdir=/usr/lib32" >> configparms
+ echo "sbindir=/usr/bin" >> configparms
+ echo "rootsbindir=/usr/bin" >> configparms
+
+ export CC="gcc -m32"
+ export CXX="g++ -m32"
+
+ # remove hardening options for building libraries
+ CFLAGS=${CFLAGS/-fstack-protector/}
+ CPPFLAGS=${CPPFLAGS/-D_FORTIFY_SOURCE=2/}
+
+ ${srcdir}/${_pkgbasename}-${pkgver}/configure --prefix=/usr \
+ --libdir=/usr/lib32 --libexecdir=/usr/lib32 \
+ --with-headers=/usr/include \
+ --with-bugurl=https://bugs.archlinux.org/ \
+ --enable-add-ons=nptl,libidn \
+ --enable-obsolete-rpc \
+ --enable-kernel=2.6.32 \
+ --enable-bind-now --disable-profile \
+ --enable-stackguard-randomization \
+ --enable-lock-elision \
+ --enable-multi-arch i686-unknown-linux-gnu
+
+ # build libraries with hardening disabled
+ echo "build-programs=no" >> configparms
+ make
+
+ # re-enable hardening for programs
+ sed -i "/build-programs=/s#no#yes#" configparms
+ echo "CC += -fstack-protector -D_FORTIFY_SOURCE=2" >> configparms
+ echo "CXX += -fstack-protector -D_FORTIFY_SOURCE=2" >> configparms
+ make
+
+ # remove harding in preparation to run test-suite
+ sed -i '4,6d' configparms
+}
+
+check() {
+ # the linker commands need to be reordered - fixed in 2.19
+ LDFLAGS=${LDFLAGS/--as-needed,/}
+
+ cd ${srcdir}/glibc-build
+
+ # only acceptable testsuite error is some small libm ulp failures on i686 with gcc-4.9
+ # TODO: fix upstream and provide patch
+ make -k check || true
+}
+
+package() {
+ cd ${srcdir}/glibc-build
+ make install_root=${pkgdir} install
+
+ rm -rf ${pkgdir}/{etc,sbin,usr/{bin,sbin,share},var}
+
+ # We need one 32 bit specific header file
+ find ${pkgdir}/usr/include -type f -not -name stubs-32.h -delete
+
+
+ # Dynamic linker
+ mkdir ${pkgdir}/usr/lib
+ ln -s ../lib32/ld-linux.so.2 ${pkgdir}/usr/lib/
+
+ # Add lib32 paths to the default library search path
+ install -Dm644 "$srcdir/lib32-glibc.conf" "$pkgdir/etc/ld.so.conf.d/lib32-glibc.conf"
+
+ # Symlink /usr/lib32/locale to /usr/lib/locale
+ ln -s ../lib/locale "$pkgdir/usr/lib32/locale"
+
+ # remove the static libraries that have a shared counterpart
+ # libc, libdl, libm and libpthread are required for toolchain testsuites
+ # in addition libcrypt appears widely required
+ rm $pkgdir/usr/lib32/lib{anl,BrokenLocale,nsl,resolv,rt,util}.a
+
+ # Do not strip the following files for improved debugging support
+ # ("improved" as in not breaking gdb and valgrind...):
+ # ld-${pkgver}.so
+ # libc-${pkgver}.so
+ # libpthread-${pkgver}.so
+ # libthread_db-1.0.so
+
+ cd $pkgdir
+ strip $STRIP_BINARIES \
+ \
+ \
+ usr/lib32/getconf/*
+
+
+ strip $STRIP_STATIC usr/lib32/*.a
+
+ strip $STRIP_SHARED usr/lib32/{libanl,libBrokenLocale,libcidn,libcrypt}-*.so \
+ usr/lib32/libnss_{compat,db,dns,files,hesiod,nis,nisplus}-*.so \
+ usr/lib32/{libdl,libm,libnsl,libresolv,librt,libutil}-*.so \
+ usr/lib32/{libmemusage,libpcprofile,libSegFault}.so \
+ usr/lib32/{audit,gconv}/*.so
+}
Copied: lib32-glibc/repos/multilib-staging-x86_64/glibc-2.19-fix-sign-in-bsloww1-input.patch (from rev 110036, lib32-glibc/trunk/glibc-2.19-fix-sign-in-bsloww1-input.patch)
===================================================================
--- multilib-staging-x86_64/glibc-2.19-fix-sign-in-bsloww1-input.patch (rev 0)
+++ multilib-staging-x86_64/glibc-2.19-fix-sign-in-bsloww1-input.patch 2014-04-23 14:15:43 UTC (rev 110037)
@@ -0,0 +1,71 @@
+From ffe768a90912f9bce43b70a82576b3dc99e3121c Mon Sep 17 00:00:00 2001
+From: Siddhesh Poyarekar <siddhesh at redhat.com>
+Date: Thu, 27 Feb 2014 21:29:16 +0530
+Subject: [PATCH] Fix sign of input to bsloww1 (BZ #16623)
+
+In 84ba214c, I removed some redundant sign computations and in the
+process, I incorrectly got rid of a temporary variable, thus passing
+the absolute value of the input to bsloww1. This caused #16623.
+
+This fix undoes the incorrect change.
+---
+ sysdeps/ieee754/dbl-64/s_sin.c | 16 ++++++++++------
+ 3 files changed, 18 insertions(+), 7 deletions(-)
+
+diff --git a/sysdeps/ieee754/dbl-64/s_sin.c b/sysdeps/ieee754/dbl-64/s_sin.c
+index 6105e9f..50109b8 100644
+--- a/sysdeps/ieee754/dbl-64/s_sin.c
++++ b/sysdeps/ieee754/dbl-64/s_sin.c
+@@ -447,19 +447,21 @@ __sin (double x)
+ }
+ else
+ {
++ double t;
+ if (a > 0)
+ {
+ m = 1;
++ t = a;
+ db = da;
+ }
+ else
+ {
+ m = 0;
+- a = -a;
++ t = -a;
+ db = -da;
+ }
+- u.x = big + a;
+- y = a - (u.x - big);
++ u.x = big + t;
++ y = t - (u.x - big);
+ res = do_sin (u, y, db, &cor);
+ cor = (cor > 0) ? 1.035 * cor + eps : 1.035 * cor - eps;
+ retval = ((res == res + cor) ? ((m) ? res : -res)
+@@ -671,19 +673,21 @@ __cos (double x)
+ }
+ else
+ {
++ double t;
+ if (a > 0)
+ {
+ m = 1;
++ t = a;
+ db = da;
+ }
+ else
+ {
+ m = 0;
+- a = -a;
++ t = -a;
+ db = -da;
+ }
+- u.x = big + a;
+- y = a - (u.x - big);
++ u.x = big + t;
++ y = t - (u.x - big);
+ res = do_sin (u, y, db, &cor);
+ cor = (cor > 0) ? 1.035 * cor + eps : 1.035 * cor - eps;
+ retval = ((res == res + cor) ? ((m) ? res : -res)
+--
+1.9.0
+
Copied: lib32-glibc/repos/multilib-staging-x86_64/glibc-2.19-xattr_header.patch (from rev 110036, lib32-glibc/trunk/glibc-2.19-xattr_header.patch)
===================================================================
--- multilib-staging-x86_64/glibc-2.19-xattr_header.patch (rev 0)
+++ multilib-staging-x86_64/glibc-2.19-xattr_header.patch 2014-04-23 14:15:43 UTC (rev 110037)
@@ -0,0 +1,42 @@
+From: Serge Hallyn <serge.hallyn at ubuntu.com>
+Date: Tue, 11 Mar 2014 04:17:07 +0000 (-0500)
+Subject: misc/sys/xattr.h: guard against linux uapi header inclusion
+X-Git-Url: https://sourceware.org/git/?p=glibc.git;a=commitdiff_plain;h=fdbe8eae;hp=fede7a5ffa188c22c3789135bd5cf82e487dd3d0
+
+misc/sys/xattr.h: guard against linux uapi header inclusion
+
+If the glibc xattr.h header is included after the uapi header,
+compilation fails due to an enum re-using a #define from the
+uapi header. Protect against this by guarding the define and
+enum inclusions against each other.
+
+(A corresponding kernel patch has been sent here:
+http://lkml.org/lkml/2014/3/7/331 )
+
+(See https://lists.debian.org/debian-glibc/2014/03/msg00029.html
+and https://sourceware.org/glibc/wiki/Synchronizing_Headers
+for more information.)
+
+Signed-off-by: Serge Hallyn <serge.hallyn at ubuntu.com>
+---
+
+diff --git a/misc/sys/xattr.h b/misc/sys/xattr.h
+index 929cd87..796df90 100644
+--- a/misc/sys/xattr.h
++++ b/misc/sys/xattr.h
+@@ -26,6 +26,7 @@ __BEGIN_DECLS
+
+ /* The following constants should be used for the fifth parameter of
+ `*setxattr'. */
++#ifndef __USE_KERNEL_XATTR_DEFS
+ enum
+ {
+ XATTR_CREATE = 1, /* set value, fail if attr already exists. */
+@@ -33,6 +34,7 @@ enum
+ XATTR_REPLACE = 2 /* set value, fail if attr does not exist. */
+ #define XATTR_REPLACE XATTR_REPLACE
+ };
++#endif
+
+ /* Set the attribute NAME of the file pointed to by PATH to VALUE (which
+ is SIZE bytes long). Return 0 on success, -1 for errors. */
Copied: lib32-glibc/repos/multilib-staging-x86_64/lib32-glibc.conf (from rev 110036, lib32-glibc/trunk/lib32-glibc.conf)
===================================================================
--- multilib-staging-x86_64/lib32-glibc.conf (rev 0)
+++ multilib-staging-x86_64/lib32-glibc.conf 2014-04-23 14:15:43 UTC (rev 110037)
@@ -0,0 +1 @@
+/usr/lib32
More information about the arch-commits
mailing list