← 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/gcc/enable-multiarch-directories.patch

  • Committer: Package Import Robot
  • Author(s): Matthias Klose
  • Date: 2012-12-06 11:10:47 UTC
  • Revision ID: package-import@ubuntu.com-20121206111047-nfkjrzjqwrdbhvbl
Tags: 1.92
* Stop building the dummy packages.
* Include the stubs-<abi>.h header for the non-default architecture
  in the libc6-dev-<arch>-cross package. Ugly hack, should really
  be built within this source package.
* Drop obsolete patches for toolchain packages.
* Allow libelf-dev as a build dependency.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/gcc/enable-multiarch-directories.patch
1
 
Index: gcc/debian/patches/cross-add-multiarch.diff
2
 
===================================================================
3
 
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
4
 
+++ gcc/debian/patches/cross-add-multiarch.diff 2012-04-15 15:09:08.278742528 +0000
5
 
@@ -0,0 +1,12 @@
6
 
+Index: gcc/src/gcc/cppdefault.c
7
 
+===================================================================
8
 
+--- gcc.orig/src/gcc/cppdefault.c      2012-01-06 00:14:32.000000000 +0000
9
 
++++ gcc/src/gcc/cppdefault.c   2012-04-15 15:08:23.450742535 +0000
10
 
+@@ -32,7 +32,6 @@
11
 
+ 
12
 
+ #if defined (CROSS_DIRECTORY_STRUCTURE) && !defined (TARGET_SYSTEM_ROOT)
13
 
+ # undef LOCAL_INCLUDE_DIR
14
 
+-# undef NATIVE_SYSTEM_HEADER_DIR
15
 
+ #else
16
 
+ # undef CROSS_INCLUDE_DIR
17
 
+ #endif
18
 
Index: gcc/debian/rules.patch
19
 
===================================================================
20
 
--- gcc.orig/debian/rules.patch 2012-04-09 20:28:04.000000000 +0000
21
 
+++ gcc/debian/rules.patch      2012-04-15 15:08:44.970742533 +0000
22
 
@@ -211,7 +211,7 @@
23
 
 endif
24
 
 
25
 
 ifeq ($(DEB_CROSS),yes)
26
 
-  debian_patches += cross-include cross-fixes
27
 
+  debian_patches += cross-include cross-fixes cross-add-multiarch
28
 
 endif
29
 
 
30
 
 ifeq ($(DEB_TARGET_ARCH_OS),hurd)