← Back to branch summary

~ubuntu-branches/ubuntu/utopic/armel-cross-toolchain-base/utopic

« back to all changes in this revision

Viewing changes to debian/patches/eglibc/ubuntu/no-symlinks-for-no-multiarch.patch

  • Committer: Dimitri John Ledkov
  • Date: 2014-02-25 17:01:27 UTC
  • Revision ID: dimitri.ledkov@canonical.com-20140225170127-usdt0nbfllnswftg
* Bump eglibc to 2.19.
* Bump kernel to 3.13.
* Bump binutils to 2.24 (belated).
* Refresh eglibc patches.
* Regeneration debian/control.
* Add rsync, xmlto build-dep.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/eglibc/ubuntu/no-symlinks-for-no-multiarch.patch
2
2
 debian/rules.d/build.mk |    4 +++-
3
3
 1 file changed, 3 insertions(+), 1 deletion(-)
4
4
 
5
 
Index: eglibc-2.17/debian/rules.d/build.mk
 
5
Index: eglibc-2.19/debian/rules.d/build.mk
6
6
===================================================================
7
 
--- eglibc-2.17.orig/debian/rules.d/build.mk
8
 
+++ eglibc-2.17/debian/rules.d/build.mk
9
 
@@ -265,6 +265,7 @@
 
7
--- eglibc-2.19.orig/debian/rules.d/build.mk    2014-02-25 16:07:47.233545700 +0000
 
8
+++ eglibc-2.19/debian/rules.d/build.mk 2014-02-25 16:08:54.000000000 +0000
 
9
@@ -261,6 +261,7 @@
10
10
          esac; \
11
11
        fi
12
12
 
14
14
        # Create the ld.so symlink to the multiarch directory
15
15
        if [ $(curpass) = libc ]; then \
16
16
          rtld_so="$$(LANG=C LC_ALL=C readelf -l debian/tmp-$(curpass)/usr/bin/iconv | grep 'interpreter' | sed -e 's/.*interpreter: \(.*\)]/\1/g')" ; \
17
 
@@ -273,7 +274,8 @@
 
17
@@ -269,7 +270,8 @@
18
18
          target="$(call xx,slibdir)/$$(readlink debian/tmp-$(curpass)/$(call xx,slibdir)/$$rtld_so)" ; \
19
19
          ln -s $$target $$link_name ;  \
20
20
        fi