patches/glibc/ports-2.12.1/440-alpha-cache-shape.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Wed Sep 07 01:22:37 2011 +0200 (2011-09-07)
branch1.12
changeset 2655 3ba359965eb0
permissions -rw-r--r--
scripts: fix sysroot prefix dir

The sysroot prefix dir was broken in #4960f5d9f829 due to a mishap
when making the out-of-sysroot lib/ symlink: the './' was mistakenly
changed into a single '.' .

Although Jonathan suggested restoring the missing '/' to restore it to
normal operation, I prefered using an explicit pushd/popd to be extra
sure of the symlink location and target, along with a fix in the sysroot
relative directory calculation.

Reported-by: Jonathan Grundon <JGrundon@xos.com>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
(transplanted from e5fc5c9ea78af28d05244ba09cf718cf75470903)
yann@2437
     1
older verisons of glibc would build dl-sysdep as shared-only and dl-support as
yann@2437
     2
static-only.  alpha hooks in a cache variable via dl-auxv.h.  newer versions of
yann@2437
     3
glibc build dl-sysdep as both shared and static which means we now have symbol
yann@2437
     4
duplication for static builds with dl-sysdep and dl-support.  since dl-sysdep
yann@2437
     5
is both shared/static, there is no point in hooking dl-support anymore, so we
yann@2437
     6
can punt it.
yann@2437
     7
yann@2437
     8
diff -durN glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/unix/sysv/linux/alpha/dl-support.c glibc-2.12.1/glibc-ports-2.12.1/sysdeps/unix/sysv/linux/alpha/dl-support.c
yann@2437
     9
--- glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/unix/sysv/linux/alpha/dl-support.c	2009-05-16 10:36:20.000000000 +0200
yann@2437
    10
+++ glibc-2.12.1/glibc-ports-2.12.1/sysdeps/unix/sysv/linux/alpha/dl-support.c	2009-11-13 00:50:53.000000000 +0100
yann@2437
    11
@@ -1,2 +1,1 @@
yann@2437
    12
-#include "dl-auxv.h"
yann@2437
    13
 #include <elf/dl-support.c>