diff options
Diffstat (limited to 'core/glibc/PKGBUILD')
| -rw-r--r-- | core/glibc/PKGBUILD | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/core/glibc/PKGBUILD b/core/glibc/PKGBUILD index 2cef407e5..c7c99fcb7 100644 --- a/core/glibc/PKGBUILD +++ b/core/glibc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 163512 2012-07-14 13:07:15Z allan $ +# $Id: PKGBUILD 165343 2012-08-16 01:57:59Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc @@ -6,13 +6,13 @@ pkgname=glibc pkgver=2.16.0 -pkgrel=2 +pkgrel=3 pkgdesc="GNU C Library" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/libc" license=('GPL' 'LGPL') groups=('base') -depends=('linux-api-headers>=3.4' 'tzdata') +depends=('linux-api-headers>=3.5' 'tzdata') makedepends=('gcc>=4.7') backup=(etc/gai.conf etc/locale.gen @@ -23,6 +23,7 @@ source=(http://ftp.gnu.org/gnu/libc/${pkgname}-${pkgver}.tar.xz{,.sig} http://ftp.gnu.org/gnu/libc/${pkgname}-ports-${pkgver}.tar.xz{,.sig} glibc-2.15-fix-res_query-assert.patch glibc-2.15-revert-c5a0802a.patch + glibc-2.16-rpcgen-cpp-path.patch nscd.rcd nscd.service nscd.tmpfiles @@ -40,12 +41,19 @@ build() { # https://bugzilla.redhat.com/show_bug.cgi?id=552960 patch -p1 -i ${srcdir}/glibc-2.15-revert-c5a0802a.patch +<<<<<<< HEAD if [ "${CARCH}" = "mips64el" ]; then ln -s ../glibc-ports-${pkgver} ports # Fix typo making util-linux build fail. sed -i "s/_MIPS_SIM_ABIN32/_MIPS_SIM_NABI32/" ports/sysdeps/unix/sysv/linux/mips/Makefile fi +======= + # prevent need for /lib/cpp symlink + # http://sourceware.org/git/?p=glibc.git;a=commit;h=bf9b740a + patch -p1 -i ${srcdir}/glibc-2.16-rpcgen-cpp-path.patch + +>>>>>>> 07455ea1de16867b168628e8a9f7f5bffc169a5f cd ${srcdir} mkdir glibc-build cd glibc-build @@ -152,15 +160,3 @@ package() { usr/lib/{libmemusage,libpcprofile,libSegFault}.so \ usr/lib/{pt_chown,{audit,gconv}/*.so} } - -md5sums=('80b181b02ab249524ec92822c0174cf7' - '2a1221a15575820751c325ef4d2fbb90' - '9a2439641be7ca8b01a3175324013031' - '218fc97a9f8777ac2688174d431e7722' - '31f415b41197d85d3bbee3d1eecd06a3' - '0a0383d50d63f1c02919fe9943b82014' - '589d79041aa767a5179eaa4e2737dd3f' - 'ad8a9af15ab7eeaa23dc7ee85024af9f' - 'bccbe5619e75cf1d97312ec3681c605c' - '07ac979b6ab5eeb778d55f041529d623' - '476e9113489f93b348b21e144b6a8fcf') |