diff options
Diffstat (limited to 'core/glibc/PKGBUILD')
| -rw-r--r-- | core/glibc/PKGBUILD | 40 |
1 files changed, 19 insertions, 21 deletions
diff --git a/core/glibc/PKGBUILD b/core/glibc/PKGBUILD index 9f4017ccc..425763386 100644 --- a/core/glibc/PKGBUILD +++ b/core/glibc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 173938 2012-12-28 13:11:04Z allan $ +# $Id: PKGBUILD 176038 2013-01-26 23:37:18Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc @@ -6,7 +6,7 @@ pkgname=glibc pkgver=2.17 -pkgrel=1 +pkgrel=2 pkgdesc="GNU C Library" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/libc" @@ -20,16 +20,25 @@ backup=(etc/gai.conf options=('!strip') install=glibc.install source=(http://ftp.gnu.org/gnu/libc/${pkgname}-${pkgver}.tar.xz{,.sig} + glibc-2.17-sync-with-linux37.patch nscd.service nscd.tmpfiles locale.gen.txt locale-gen) +md5sums=('87bf675c8ee523ebda4803e8e1cec638' + '6db4d1661cf34282755dc90330465f6d' + 'fb99380d94598cc76d793deebf630022' + 'c1e07c0bec0fe89791bfd9d13fc85edf' + 'bccbe5619e75cf1d97312ec3681c605c' + '07ac979b6ab5eeb778d55f041529d623' + '476e9113489f93b348b21e144b6a8fcf') + build() { cd ${srcdir}/${pkgname}-${pkgver} - # ldconfig does not need to look in /usr/lib64 or /usr/libx32 on Arch Linux - sed -i "s#add_system_dir#do_not_add_system_dir#" sysdeps/unix/sysv/linux/x86_64/dl-cache.h + # combination of upstream commits 318cd0b, b540704 and fc1abbe + patch -p1 -i ${srcdir}/glibc-2.17-sync-with-linux37.patch cd ${srcdir} mkdir -p glibc-build @@ -54,6 +63,7 @@ build() { --host=${CHOST} --build=${CHOST} \ --libdir=/usr/lib --libexecdir=/usr/lib \ --with-headers=/usr/include \ + --with-bugurl=https://labs.parabola.nu/ \ --enable-add-ons=nptl,libidn$extra_addons \ --enable-obsolete-rpc \ --enable-kernel=2.6.32 \ @@ -92,10 +102,7 @@ package() { rm -f ${pkgdir}/etc/ld.so.{cache,conf} - # eventually this will move to the filesystem package - ln -s usr/lib ${pkgdir}/lib - - install -dm755 ${pkgdir}/{etc/rc.d,usr/{sbin,lib/{,locale,systemd/system,tmpfiles.d}}} + 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}/nscd.service ${pkgdir}/usr/lib/systemd/system @@ -103,19 +110,16 @@ package() { install -m644 ${srcdir}/${pkgname}-${pkgver}/posix/gai.conf ${pkgdir}/etc/gai.conf - install -m755 ${srcdir}/locale-gen ${pkgdir}/usr/sbin + install -m755 ${srcdir}/locale-gen ${pkgdir}/usr/bin + + # temporary symlink + ln -s ../../sbin/ldconfig ${pkgdir}/usr/bin/ldconfig # 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 - if [[ ${CARCH} = "x86_64" ]]; then - # fix paths and compliance with binary blobs... - sed -i '/RTLDLIST/s%lib64%lib%' ${pkgdir}/usr/bin/ldd - ln -s usr/lib ${pkgdir}/lib64 - fi - # Do not strip the following files for improved debugging support # ("improved" as in not breaking gdb and valgrind...): # ld-${pkgver}.so @@ -139,9 +143,3 @@ package() { usr/lib/{libmemusage,libpcprofile,libSegFault}.so \ usr/lib/{pt_chown,{audit,gconv}/*.so} } -md5sums=('87bf675c8ee523ebda4803e8e1cec638' - '6db4d1661cf34282755dc90330465f6d' - 'c1e07c0bec0fe89791bfd9d13fc85edf' - 'bccbe5619e75cf1d97312ec3681c605c' - '07ac979b6ab5eeb778d55f041529d623' - '476e9113489f93b348b21e144b6a8fcf') |