r5208 - in glibc-package/trunk/debian: . patches patches/arm
Author: aurel32
Date: 2012-04-26 15:33:48 +0000 (Thu, 26 Apr 2012)
New Revision: 5208
Added:
glibc-package/trunk/debian/patches/arm/local-soname-hack.diff
Removed:
glibc-package/trunk/debian/patches/arm/unsubmitted-soname-hack.diff
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/series
Log:
* patches/arm/unsubmitted-soname-hack.diff: rename into
patches/arm/local-soname-hack.diff to fix non-policy compliant patch
name.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2012-04-26 15:31:28 UTC (rev 5207)
+++ glibc-package/trunk/debian/changelog 2012-04-26 15:33:48 UTC (rev 5208)
@@ -46,6 +46,9 @@
#661878.
* patches/arm/cvs-make-get-set-swap-context.diff: backport
make/get/set/swapcontext from upstream. Closes: #369453, #663150.
+ * patches/arm/unsubmitted-soname-hack.diff: rename into
+ patches/arm/local-soname-hack.diff to fix non-policy compliant patch
+ name.
-- Aurelien Jarno <aurel32@debian.org> Thu, 26 Apr 2012 16:37:27 +0200
Copied: glibc-package/trunk/debian/patches/arm/local-soname-hack.diff (from rev 5204, glibc-package/trunk/debian/patches/arm/unsubmitted-soname-hack.diff)
===================================================================
--- glibc-package/trunk/debian/patches/arm/local-soname-hack.diff (rev 0)
+++ glibc-package/trunk/debian/patches/arm/local-soname-hack.diff 2012-04-26 15:33:48 UTC (rev 5208)
@@ -0,0 +1,21 @@
+For backward compatibility with armhf binaries built with the
+old linker SONAME, we need to fake out the linker to believe
+the new is the old, until such a point as everything is rebuilt
+
+--- eglibc-2.15.orig/elf/dl-load.c 2012-04-14 12:11:37.000000000 +0000
++++ eglibc-2.15/elf/dl-load.c 2012-04-15 00:39:36.558765502 +0000
+@@ -2303,10 +2303,13 @@
+ soname = ((const char *) D_PTR (l, l_info[DT_STRTAB])
+ + l->l_info[DT_SONAME]->d_un.d_val);
+ if (strcmp (name, soname) != 0)
++#ifdef __arm__
++ if (strcmp(name, "ld-linux.so.3") || strcmp(soname, "ld-linux-armhf.so.3"))
++#endif
+ continue;
+
+ /* We have a match on a new name -- cache it. */
+- add_name_to_object (l, soname);
++ add_name_to_object (l, name);
+ l->l_soname_added = 1;
+ }
+
Deleted: glibc-package/trunk/debian/patches/arm/unsubmitted-soname-hack.diff
===================================================================
--- glibc-package/trunk/debian/patches/arm/unsubmitted-soname-hack.diff 2012-04-26 15:31:28 UTC (rev 5207)
+++ glibc-package/trunk/debian/patches/arm/unsubmitted-soname-hack.diff 2012-04-26 15:33:48 UTC (rev 5208)
@@ -1,21 +0,0 @@
-For backward compatibility with armhf binaries built with the
-old linker SONAME, we need to fake out the linker to believe
-the new is the old, until such a point as everything is rebuilt
-
---- eglibc-2.15.orig/elf/dl-load.c 2012-04-14 12:11:37.000000000 +0000
-+++ eglibc-2.15/elf/dl-load.c 2012-04-15 00:39:36.558765502 +0000
-@@ -2303,10 +2303,13 @@
- soname = ((const char *) D_PTR (l, l_info[DT_STRTAB])
- + l->l_info[DT_SONAME]->d_un.d_val);
- if (strcmp (name, soname) != 0)
-+#ifdef __arm__
-+ if (strcmp(name, "ld-linux.so.3") || strcmp(soname, "ld-linux-armhf.so.3"))
-+#endif
- continue;
-
- /* We have a match on a new name -- cache it. */
-- add_name_to_object (l, soname);
-+ add_name_to_object (l, name);
- l->l_soname_added = 1;
- }
-
Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series 2012-04-26 15:31:28 UTC (rev 5207)
+++ glibc-package/trunk/debian/patches/series 2012-04-26 15:33:48 UTC (rev 5208)
@@ -92,7 +92,7 @@
arm/cvs-syscall-mcount.diff
arm/cvs-ucontext.diff
arm/unsubmitted-armhf-linker.diff
-arm/unsubmitted-soname-hack.diff
+arm/local-soname-hack.diff
arm/cvs-make-get-set-swap-context.diff
hppa/local-inlining.diff
Reply to: