mirror of
https://gitdl.cn/https://github.com/chakralinux/lib32.git
synced 2025-02-03 02:27:16 +08:00
TC (lib32): updated lib32-glibc to 2.22
This commit is contained in:
parent
a56b998114
commit
401756ace5
@ -5,7 +5,7 @@
|
||||
|
||||
_pkgbasename=glibc
|
||||
pkgname=lib32-$_pkgbasename
|
||||
pkgver=2.20
|
||||
pkgver=2.22
|
||||
pkgrel=1
|
||||
pkgdesc="GNU C Library (32-bit)"
|
||||
arch=('x86_64')
|
||||
@ -13,32 +13,21 @@ url="http://www.gnu.org/software/libc"
|
||||
license=('GPL' 'LGPL')
|
||||
#depends=($_pkgbasename=$pkgver)
|
||||
makedepends=('gcc-multilib>=4.9')
|
||||
options=('!strip' '!emptydirs' 'staticlibs')
|
||||
source=(http://ftp.gnu.org/gnu/libc/${_pkgbasename}-${pkgver}.tar.xz{,.sig}
|
||||
glibc-2.20-getifaddrs_internal-segfault.patch
|
||||
glibc-2.20-linux-3.16-additions.patch
|
||||
glibc-2.20-do_ftell_wide-memleak.patch
|
||||
lib32-glibc.conf)
|
||||
md5sums=('948a6e06419a01bd51e97206861595b0'
|
||||
dtv_surplus.patch
|
||||
lib32-glibc.conf
|
||||
)
|
||||
md5sums=('e51e02bf552a0a1fbbdc948fb2f5e83c'
|
||||
'SKIP'
|
||||
'1c5d5c2017445c75dbc5c6d0c1e45ddb'
|
||||
'8f1059f431b842e54b12bde689620df8'
|
||||
'b50feeab78fa6ce0a8cfb41ee8dc1fd8'
|
||||
'6469cba12e2252e16e32db0353ed3f21'
|
||||
'6e052f1cb693d5d3203f50f9d4e8c33b')
|
||||
validpgpkeys=('F37CDAB708E65EA183FD1AF625EF0A436C2A4AFF') # Carlos O'Donell
|
||||
|
||||
prepare() {
|
||||
cd ${srcdir}/glibc-${pkgver}
|
||||
|
||||
# fix segfault in getifaddrs_internal
|
||||
# https://sourceware.org/ml/libc-alpha/2014-09/msg00312.html
|
||||
patch -p1 -i $srcdir/glibc-2.20-getifaddrs_internal-segfault.patch
|
||||
|
||||
# linux 3.16 additions - commit 0bd72468
|
||||
patch -p1 -i $srcdir/glibc-2.20-linux-3.16-additions.patch
|
||||
|
||||
# plug memory leak - commit 984c0ea9
|
||||
patch -p1 -i $srcdir/glibc-2.20-do_ftell_wide-memleak.patch
|
||||
# http://chakraos.org/bugtracker/index.php?do=details&task_id=1060&project=8
|
||||
patch -p1 -i $srcdir/dtv_surplus.patch
|
||||
|
||||
mkdir ${srcdir}/glibc-build
|
||||
}
|
||||
@ -46,18 +35,15 @@ prepare() {
|
||||
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 "rtlddir=/usr/lib32" >> configparms
|
||||
echo "sbindir=/usr/sbin" >> configparms
|
||||
echo "rootsbindir=/usr/sbin" >> configparms
|
||||
|
||||
export CC="gcc -m32"
|
||||
export CXX="g++ -m32"
|
||||
|
||||
|
||||
# remove hardening options for building libraries
|
||||
CFLAGS=${CFLAGS/-fstack-protector-strong/}
|
||||
CPPFLAGS=${CPPFLAGS/-D_FORTIFY_SOURCE=2/}
|
||||
@ -65,14 +51,16 @@ build() {
|
||||
${srcdir}/${_pkgbasename}-${pkgver}/configure --prefix=/usr \
|
||||
--libdir=/usr/lib32 --libexecdir=/usr/lib32 \
|
||||
--with-headers=/usr/include \
|
||||
--with-bugurl=http://chakraos.org/bugtracker\
|
||||
--with-bugurl=https://chakraos.org/bugtracker \
|
||||
--enable-add-ons \
|
||||
--enable-obsolete-rpc \
|
||||
--enable-kernel=2.6.32 \
|
||||
--enable-bind-now --disable-profile \
|
||||
--enable-stackguard-randomization \
|
||||
--enable-lock-elision \
|
||||
--enable-multi-arch \
|
||||
--disable-werror \
|
||||
--enable-multi-arch i686-unknown-linux-gnu
|
||||
# --enable-lock-elision \
|
||||
|
||||
# build libraries with hardening disabled
|
||||
echo "build-programs=no" >> configparms
|
||||
@ -86,6 +74,7 @@ build() {
|
||||
|
||||
# remove harding in preparation to run test-suite
|
||||
sed -i '5,7d' configparms
|
||||
|
||||
}
|
||||
|
||||
check() {
|
||||
|
Loading…
Reference in New Issue
Block a user