mirror of
https://github.com/archlinuxarm/PKGBUILDs.git
synced 2024-11-08 22:45:43 +00:00
core/glibc to 2.23-1
This commit is contained in:
Kevin Mihelich
parent
eb36f1d54d
commit
e2889f6a3a
2 changed files with 19 additions and 45 deletions
|
|
@ -4,8 +4,6 @@
|
|||
# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
|
||||
# NOTE: valgrind requires rebuilt with each major glibc version
|
||||
|
||||
# NOTE: adjust version in install script when locale files are updated
|
||||
|
||||
# ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
|
||||
# - Patch for ld-linux-armhf.so.3 transition and symlink ld-linux.so.3
|
||||
# - Patch for hard-float ld.so.cache transition
|
||||
|
|
@ -15,56 +13,42 @@
|
|||
noautobuild=1
|
||||
|
||||
pkgname=glibc
|
||||
pkgver=2.22
|
||||
pkgrel=4.1
|
||||
pkgver=2.23
|
||||
pkgrel=1
|
||||
_commit=e742928c
|
||||
pkgdesc="GNU C Library"
|
||||
arch=('i686' 'x86_64')
|
||||
url="http://www.gnu.org/software/libc"
|
||||
license=('GPL' 'LGPL')
|
||||
groups=('base')
|
||||
depends=('linux-api-headers>=4.1' 'tzdata' 'filesystem')
|
||||
makedepends=('gcc>=5.2')
|
||||
makedepends=('gcc>=5.2' 'git')
|
||||
backup=(etc/gai.conf
|
||||
etc/locale.gen
|
||||
etc/nscd.conf)
|
||||
options=('!strip' 'staticlibs' '!distcc')
|
||||
install=glibc.install
|
||||
source=(http://ftp.gnu.org/gnu/libc/${pkgname}-${pkgver}.tar.xz{,.sig}
|
||||
source=(git://sourceware.org/git/glibc.git#commit=${_commit}
|
||||
local-soname-hack.diff
|
||||
glibc-2.22-roundup.patch
|
||||
glibc-2.22-CVE-2015-7547.patch
|
||||
locale.gen.txt
|
||||
locale-gen)
|
||||
md5sums=('e51e02bf552a0a1fbbdc948fb2f5e83c'
|
||||
'SKIP'
|
||||
md5sums=('SKIP'
|
||||
'905370139382428ef2b97b247c0970bf'
|
||||
'd4b9754a2d5e8f113d47c67386f75e7b'
|
||||
'db053da46e40f25a0fc988936725080b'
|
||||
'07ac979b6ab5eeb778d55f041529d623'
|
||||
'476e9113489f93b348b21e144b6a8fcf')
|
||||
validpgpkeys=('F37CDAB708E65EA183FD1AF625EF0A436C2A4AFF') # Carlos O'Donell
|
||||
|
||||
prepare() {
|
||||
cd ${srcdir}/${pkgname}-${pkgver}
|
||||
|
||||
# glibc-2.22..287de30e
|
||||
# 060f8dbd (and 13ff0739) is reverted as it breaks the testsuite on x86_64
|
||||
# TODO: figure out why...
|
||||
patch -p1 -i $srcdir/glibc-2.22-roundup.patch
|
||||
|
||||
# CVE-2015-7547 - patch from upstream
|
||||
patch -p1 -i $srcdir/glibc-2.22-CVE-2015-7547.patch
|
||||
mkdir glibc-build
|
||||
|
||||
cd ${pkgname}
|
||||
# ALARM: patch for hard-float ld-linux soname
|
||||
if [[ $CARCH == "armv6h" || $CARCH == "armv7h" ]]; then
|
||||
patch -p1 -i ${srcdir}/local-soname-hack.diff
|
||||
fi
|
||||
|
||||
mkdir ${srcdir}/glibc-build
|
||||
}
|
||||
|
||||
build() {
|
||||
cd ${srcdir}/glibc-build
|
||||
cd glibc-build
|
||||
|
||||
# ALARM: Specify build host types
|
||||
[[ $CARCH == "arm" ]] && CONFIGFLAG="--host=armv5tel-unknown-linux-gnueabi --build=armv5tel-unknown-linux-gnueabi"
|
||||
|
|
@ -84,7 +68,7 @@ build() {
|
|||
# enable unwinding tables so that gdb can unwind the standard functions
|
||||
CFLAGS+=" -funwind-tables"
|
||||
|
||||
${srcdir}/${pkgname}-${pkgver}/configure --prefix=/usr \
|
||||
../${pkgname}/configure --prefix=/usr \
|
||||
--libdir=/usr/lib --libexecdir=/usr/lib \
|
||||
--with-headers=/usr/include \
|
||||
--with-bugurl=https://github.com/archlinuxarm/PKGBUILDs/issues \
|
||||
|
|
@ -109,18 +93,18 @@ build() {
|
|||
make
|
||||
|
||||
# remove harding in preparation to run test-suite
|
||||
sed -i '5,7d' configparms
|
||||
sed -i '/FORTIFY/d' configparms
|
||||
}
|
||||
|
||||
check() {
|
||||
cd ${srcdir}/glibc-build
|
||||
cd glibc-build
|
||||
|
||||
# some failures are "expected"
|
||||
make check || true
|
||||
}
|
||||
|
||||
package() {
|
||||
cd ${srcdir}/glibc-build
|
||||
cd glibc-build
|
||||
|
||||
install -dm755 ${pkgdir}/etc
|
||||
touch ${pkgdir}/etc/ld.so.conf
|
||||
|
|
@ -131,26 +115,18 @@ package() {
|
|||
|
||||
install -dm755 ${pkgdir}/usr/lib/{locale,systemd/system,tmpfiles.d}
|
||||
|
||||
install -m644 ${srcdir}/${pkgname}-${pkgver}/nscd/nscd.conf ${pkgdir}/etc/nscd.conf
|
||||
install -m644 ${srcdir}/${pkgname}-${pkgver}/nscd/nscd.service ${pkgdir}/usr/lib/systemd/system
|
||||
install -m644 ${srcdir}/${pkgname}-${pkgver}/nscd/nscd.tmpfiles ${pkgdir}/usr/lib/tmpfiles.d/nscd.conf
|
||||
install -m644 ${srcdir}/${pkgname}/nscd/nscd.conf ${pkgdir}/etc/nscd.conf
|
||||
install -m644 ${srcdir}/${pkgname}/nscd/nscd.service ${pkgdir}/usr/lib/systemd/system
|
||||
install -m644 ${srcdir}/${pkgname}/nscd/nscd.tmpfiles ${pkgdir}/usr/lib/tmpfiles.d/nscd.conf
|
||||
|
||||
install -m644 ${srcdir}/${pkgname}-${pkgver}/posix/gai.conf ${pkgdir}/etc/gai.conf
|
||||
install -m644 ${srcdir}/${pkgname}/posix/gai.conf ${pkgdir}/etc/gai.conf
|
||||
|
||||
install -m755 ${srcdir}/locale-gen ${pkgdir}/usr/bin
|
||||
|
||||
# create /etc/locale.gen
|
||||
install -m644 ${srcdir}/locale.gen.txt ${pkgdir}/etc/locale.gen
|
||||
sed -e '1,3d' -e 's|/| |g' -e 's|\\| |g' -e 's|^|#|g' \
|
||||
${srcdir}/glibc-${pkgver}/localedata/SUPPORTED >> ${pkgdir}/etc/locale.gen
|
||||
|
||||
# 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/lib/lib{anl,BrokenLocale,nsl,resolv,rt,util}.a
|
||||
if [[ $CARCH = "x86_64" ]]; then
|
||||
rm $pkgdir/usr/lib/libmvec.a
|
||||
fi
|
||||
${srcdir}/glibc/localedata/SUPPORTED >> ${pkgdir}/etc/locale.gen
|
||||
|
||||
# ALARM: symlink ld-linux.so.3 for hard-float
|
||||
[[ $CARCH == "armv6h" || $CARCH == "armv7h" ]] && ln -s /lib/ld-${pkgver}.so ${pkgdir}/usr/lib/ld-linux.so.3
|
||||
|
|
|
|||
|
|
@ -2,9 +2,7 @@ infodir=usr/share/info
|
|||
filelist=(libc.info{,-1,-2,-3,-4,-5,-6,-7,-8,-9,-10,-11})
|
||||
|
||||
post_upgrade() {
|
||||
#if [[ $(vercmp 2.22-3 $2) = 1 ]]; then
|
||||
locale-gen
|
||||
#fi
|
||||
locale-gen
|
||||
|
||||
ldconfig -r .
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue