diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2012-06-14 18:16:51 +0200 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-06-14 18:16:51 +0200 |
commit | b32e36625b44b5c002c417ab4faf6311258c7671 (patch) | |
tree | 87f91f6f7d9ccb229f9c7613f5411534bd504f5e /staging/glibc/glibc-2.15-lddebug-scopes.patch | |
parent | 1a274201c465801ed2271018f426f0eaf7098215 (diff) | |
parent | 35c30674b2b901077a809a6f1d8e5a0115098c8b (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-staging/mplayer2/PKGBUILD
community/pcmanfm/PKGBUILD
extra/liblrdf/PKGBUILD
extra/php-apc/PKGBUILD
extra/sqlite/PKGBUILD
kde-unstable/libkgapi/PKGBUILD
kde-unstable/soprano/PKGBUILD
multilib/lib32-libphobos-ldc/PKGBUILD
multilib/lib32-pixman/PKGBUILD
multilib/lib32-sqlite3/PKGBUILD
Diffstat (limited to 'staging/glibc/glibc-2.15-lddebug-scopes.patch')
-rw-r--r-- | staging/glibc/glibc-2.15-lddebug-scopes.patch | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/staging/glibc/glibc-2.15-lddebug-scopes.patch b/staging/glibc/glibc-2.15-lddebug-scopes.patch deleted file mode 100644 index 808cf8d7c..000000000 --- a/staging/glibc/glibc-2.15-lddebug-scopes.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 0c95ab64cb4ec0d22bb222647d9d20c7b4903e38 Mon Sep 17 00:00:00 2001 -From: Andreas Schwab <schwab@redhat.com> -Date: Fri, 7 Oct 2011 09:31:27 +0200 -Subject: [PATCH] Horrible workaround for horribly broken software - ---- - elf/rtld.c | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -diff --git a/elf/rtld.c b/elf/rtld.c -index 978c609..8422b9f 100644 ---- a/elf/rtld.c -+++ b/elf/rtld.c -@@ -1393,7 +1393,9 @@ of this helper program; chances are you did not intend to run this program.\n\ - char *copy = malloc (len); - if (copy == NULL) - _dl_fatal_printf ("out of memory\n"); -- l->l_libname->name = l->l_name = memcpy (copy, dsoname, len); -+ l->l_libname->name = memcpy (copy, dsoname, len); -+ if (GLRO(dl_debug_mask)) -+ l->l_name = copy; - } - - /* Add the vDSO to the object list. */ --- -1.7.3.4 - |