diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-08-20 13:10:38 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-08-20 13:10:38 -0300 |
| commit | 125e2429b897d89b7e37fd8ca7b6e11926f677ae (patch) | |
| tree | 9a0b07f11c2c427537722b52c61ee81321497c96 | |
| parent | eb13db73efc6dcc424d687f3c6669cfadc7c9657 (diff) | |
Merged
| -rw-r--r-- | core/glibc/PKGBUILD | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/core/glibc/PKGBUILD b/core/glibc/PKGBUILD index c7c99fcb7..4d3364786 100644 --- a/core/glibc/PKGBUILD +++ b/core/glibc/PKGBUILD @@ -41,19 +41,17 @@ build() { # https://bugzilla.redhat.com/show_bug.cgi?id=552960 patch -p1 -i ${srcdir}/glibc-2.15-revert-c5a0802a.patch -<<<<<<< HEAD + # 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 + 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 |