summaryrefslogtreecommitdiffstats
path: root/debian/patches/cross-no-locale-include.diff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--debian/patches/cross-no-locale-include.diff17
1 files changed, 17 insertions, 0 deletions
diff --git a/debian/patches/cross-no-locale-include.diff b/debian/patches/cross-no-locale-include.diff
new file mode 100644
index 0000000..c728316
--- /dev/null
+++ b/debian/patches/cross-no-locale-include.diff
@@ -0,0 +1,17 @@
+# DP: Don't add /usr/local/include for cross compilers. Assume that
+# DP: /usr/include is ready for multiarch, but not /usr/local/include.
+
+--- a/src/gcc/cppdefault.cc
++++ b/src/gcc/cppdefault.cc
+@@ -66,8 +66,11 @@
+ #ifdef LOCAL_INCLUDE_DIR
+ /* /usr/local/include comes before the fixincluded header files. */
+ { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 2 },
++#if 0
++ /* Unsafe to assume that /usr/local/include is ready for multiarch. */
+ { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 0 },
+ #endif
++#endif
+ #ifdef PREFIX_INCLUDE_DIR
+ { PREFIX_INCLUDE_DIR, 0, 0, 1, 0, 0 },
+ #endif