[arch-commits] Commit in lib32-glibc/repos (4 files)
Jan Steffens
heftig at nymeria.archlinux.org
Sat Feb 8 11:33:49 UTC 2014
Date: Saturday, February 8, 2014 @ 12:33:49
Author: heftig
Revision: 105450
archrelease: copy trunk to multilib-testing-x86_64
Added:
lib32-glibc/repos/multilib-testing-x86_64/
lib32-glibc/repos/multilib-testing-x86_64/PKGBUILD
(from rev 105449, lib32-glibc/trunk/PKGBUILD)
lib32-glibc/repos/multilib-testing-x86_64/glibc-2.18-xattr-compat-hack.patch
(from rev 105449, lib32-glibc/trunk/glibc-2.18-xattr-compat-hack.patch)
lib32-glibc/repos/multilib-testing-x86_64/lib32-glibc.conf
(from rev 105449, lib32-glibc/trunk/lib32-glibc.conf)
------------------------------------+
PKGBUILD | 136 +++++++++++++++++++++++++++++++++++
glibc-2.18-xattr-compat-hack.patch | 19 ++++
lib32-glibc.conf | 1
3 files changed, 156 insertions(+)
Copied: lib32-glibc/repos/multilib-testing-x86_64/PKGBUILD (from rev 105449, lib32-glibc/trunk/PKGBUILD)
===================================================================
--- multilib-testing-x86_64/PKGBUILD (rev 0)
+++ multilib-testing-x86_64/PKGBUILD 2014-02-08 11:33:49 UTC (rev 105450)
@@ -0,0 +1,136 @@
+# $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=1
+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.18-xattr-compat-hack.patch
+ lib32-glibc.conf)
+md5sums=('e26b8cc666b162f999404b03970f14e4'
+ 'SKIP'
+ '7ca96c68a37f2a4ab91792bfa0160a24'
+ '6e052f1cb693d5d3203f50f9d4e8c33b')
+
+prepare() {
+ cd ${srcdir}/${_pkgbasename}-${pkgver}
+
+ # hack fix for {linux,sys}/xattr.h incompatibility
+ patch -p1 -i $srcdir/glibc-2.18-xattr-compat-hack.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
+ make check
+}
+
+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-testing-x86_64/glibc-2.18-xattr-compat-hack.patch (from rev 105449, lib32-glibc/trunk/glibc-2.18-xattr-compat-hack.patch)
===================================================================
--- multilib-testing-x86_64/glibc-2.18-xattr-compat-hack.patch (rev 0)
+++ multilib-testing-x86_64/glibc-2.18-xattr-compat-hack.patch 2014-02-08 11:33:49 UTC (rev 105450)
@@ -0,0 +1,19 @@
+diff -Naur glibc-2.18-orig/misc/sys/xattr.h glibc-2.18/misc/sys/xattr.h
+--- glibc-2.18-orig/misc/sys/xattr.h 2013-08-11 08:52:55.000000000 +1000
++++ glibc-2.18/misc/sys/xattr.h 2014-01-07 15:45:50.533969040 +1000
+@@ -26,13 +26,8 @@
+
+ /* The following constants should be used for the fifth parameter of
+ `*setxattr'. */
+-enum
+-{
+- XATTR_CREATE = 1, /* set value, fail if attr already exists. */
+-#define XATTR_CREATE XATTR_CREATE
+- XATTR_REPLACE = 2 /* set value, fail if attr does not exist. */
+-#define XATTR_REPLACE XATTR_REPLACE
+-};
++#define XATTR_CREATE 1
++#define XATTR_REPLACE 2
+
+ /* 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-testing-x86_64/lib32-glibc.conf (from rev 105449, lib32-glibc/trunk/lib32-glibc.conf)
===================================================================
--- multilib-testing-x86_64/lib32-glibc.conf (rev 0)
+++ multilib-testing-x86_64/lib32-glibc.conf 2014-02-08 11:33:49 UTC (rev 105450)
@@ -0,0 +1 @@
+/usr/lib32
More information about the arch-commits
mailing list