← 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: Package Import Robot
  • Author(s): Marcin Juszkiewicz
  • Date: 2012-02-16 18:16:08 UTC
  • Revision ID: package-import@ubuntu.com-20120216181608-l7nm0wj95l7jfzzt
Tags: 1.78
* Updated gcc-4.6 dependency to 4.6.2-14ubuntu2 to get fixed
        debian/control.m4
* Updated Debian build
* Fixed multiarch directories patch.
* Updated kernel version to 3.2
* eglibc: refreshed patches to 2.15

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
 
--- eglibc-2.13.orig/debian/rules.d/build.mk
6
 
+++ eglibc-2.13/debian/rules.d/build.mk
7
 
@@ -237,19 +237,21 @@ else
8
 
            armhf) \
9
 
              sed -i '/RTLDLIST=/s,=\(.*\),="\1 /lib/ld-linux.so.3",' debian/tmp-$(curpass)/usr/bin/ldd;; \
 
5
Index: eglibc-2.15~pre6/debian/rules.d/build.mk
 
6
===================================================================
 
7
--- eglibc-2.15~pre6.orig/debian/rules.d/build.mk       2012-02-02 00:05:52.000000000 +0000
 
8
+++ eglibc-2.15~pre6/debian/rules.d/build.mk    2012-02-03 11:45:08.264707111 +0000
 
9
@@ -247,6 +247,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
 
          rtld_so="$$(basename $$rtld_so)" ; \
18
 
          link_name="debian/tmp-$(curpass)/lib/$$rtld_so" ; \
 
17
@@ -255,7 +256,8 @@
19
18
          target="$(call xx,slibdir)/$$(readlink debian/tmp-$(curpass)/$(call xx,slibdir)/$$rtld_so)" ; \
20
19
          ln -s $$target $$link_name ;  \
21
20
        fi
25
24
        $(call xx,extra_install)
26
25
 endif
27
26
        touch $@
28
 
 
29
 
 $(stamp)doc: $(stamp)patch