← 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/arm64-no-profile.diff

  • Committer: Package Import Robot
  • Author(s): Colin Watson
  • Date: 2013-02-08 20:39:31 UTC
  • mfrom: (206.1.2 raring)
  • Revision ID: package-import@ubuntu.com-20130208203931-e9l1bsu6u7tb9ae1
Tags: 1.101
* Merge packaging from armhf-cross-toolchain-base 1.101:
  - Bump eglibc to 2.17.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/eglibc/ubuntu/arm64-no-profile.diff
1
 
--- eglibc-2.16/debian/rules.d/control.mk~      2012-10-26 03:53:59.000000000 +0200
2
 
+++ eglibc-2.16/debian/rules.d/control.mk       2012-12-14 16:59:33.259538814 +0100
3
 
@@ -9,6 +9,7 @@
4
 
 $(patsubst %,debian/control.in/%,$(libc_packages)) :: debian/control.in/% : debian/control.in/libc debian/rules.d/control.mk
5
 
        sed -e "s%@libc@%$*%g" \
6
 
            -e "s%@archs@%$($(subst .,_,$*)_archs)%g" \
7
 
+           -e "s%@parchs@%$(filter-out arm64,$($(subst .,_,$*)_archs))%g" \
8
 
            -e "s%@libc-dev-conflict@%$(foreach arch,$(filter-out $*,$(libc_packages)),$(arch)-dev,)%g" \
9
 
            < $< > $@
10
 
 
11
 
--- eglibc-2.16/debian/control~ 2012-12-14 16:51:39.655547223 +0100
12
 
+++ eglibc-2.16/debian/control  2012-12-14 16:59:47.207540669 +0100
13
 
@@ -188,7 +188,7 @@
14
 
  library.
15
 
 
16
 
 Package: libc6-prof
17
 
-Architecture: amd64 arm arm64 armel armhf hppa i386 m68k mips mipsel powerpc powerpcspe ppc64 sparc sparc64 s390 s390x sh4 x32
18
 
+Architecture: amd64 arm armel armhf hppa i386 m68k mips mipsel powerpc powerpcspe ppc64 sparc sparc64 s390 s390x sh4 x32
19
 
 Section: libdevel
20
 
 Priority: extra
21
 
 Multi-Arch: same
22
 
--- eglibc-2.16/debian/control.in/libc~ 2012-10-26 17:50:39.000000000 +0200
23
 
+++ eglibc-2.16/debian/control.in/libc  2012-12-14 16:56:25.175542789 +0100
24
 
@@ -51,7 +51,7 @@
25
 
  library.
26
 
 
27
 
 Package: @libc@-prof
28
 
-Architecture: @archs@
29
 
+Architecture: @parchs@
30
 
 Section: libdevel
31
 
 Priority: extra
32
 
 Multi-Arch: same
33
 
--- eglibc-2.16/debian/rules~   2012-11-26 02:54:29.000000000 +0100
34
 
+++ eglibc-2.16/debian/rules    2012-12-14 17:04:32.975536716 +0100
35
 
@@ -143,7 +143,7 @@
36
 
   DEB_INDEP_REGULAR_PACKAGES = 
37
 
   DEB_UDEB_PACKAGES = 
38
 
 else
39
 
-  DEB_ARCH_REGULAR_PACKAGES = $(libc) $(libc)-dev $(libc)-dbg $(libc)-prof $(libc)-pic libc-bin libc-dev-bin multiarch-support
40
 
+  DEB_ARCH_REGULAR_PACKAGES = $(libc) $(libc)-dev $(libc)-dbg $(if $(filter arm64, $(DEB_HOST_ARCH)),,$(libc)-prof) $(libc)-pic libc-bin libc-dev-bin multiarch-support
41
 
   DEB_INDEP_REGULAR_PACKAGES = glibc-doc eglibc-source
42
 
   DEB_UDEB_PACKAGES = $(libc)-udeb libnss-dns-udeb libnss-files-udeb
43
 
 endif