← Back to branch summary

~ubuntu-branches/ubuntu/trusty/armel-cross-toolchain-base/trusty-proposed

« back to all changes in this revision

Viewing changes to debian/patches/eglibc/ubuntu/lucid-is-not-multiarch.patch

  • Committer: Package Import Robot
  • Author(s): Marcin Juszkiewicz
  • Date: 2012-03-08 16:30:09 UTC
  • Revision ID: package-import@ubuntu.com-20120308163009-qrqcw51326ybjtso
Tags: 1.79
Rebuild with gcc 4.6.3

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/eglibc/ubuntu/lucid-is-not-multiarch.patch
 
1
--- eglibc-2.15/debian/rules.d/stage1.mk.orig   2012-02-21 13:11:28.852311731 +0000
 
2
+++ eglibc-2.15/debian/rules.d/stage1.mk        2012-02-21 13:11:46.048312052 +0000
 
3
@@ -60,11 +60,13 @@
 
4
        done
 
5
        $(MAKE) -C $(DEB_BUILDDIR) install_root=$(DESTDIR) install-bootstrap-headers=yes \
 
6
                csu/subdir_install install-headers
 
7
+ifdef DEB_HOST_MULTIARCH
 
8
        mkdir -p $(DESTDIR)/usr/include/$(DEB_HOST_MULTIARCH)
 
9
        mv $(DESTDIR)/usr/include/bits          $(DESTDIR)/usr/include/$(DEB_HOST_MULTIARCH)
 
10
        mv $(DESTDIR)/usr/include/gnu           $(DESTDIR)/usr/include/$(DEB_HOST_MULTIARCH)
 
11
        mv $(DESTDIR)/usr/include/sys           $(DESTDIR)/usr/include/$(DEB_HOST_MULTIARCH)
 
12
        mv $(DESTDIR)/usr/include/fpu_control.h $(DESTDIR)/usr/include/$(DEB_HOST_MULTIARCH)
 
13
+endif
 
14
        $(call xx,extra_install)
 
15
        touch $@
 
16