57 lines
1.9 KiB
Diff
57 lines
1.9 KiB
Diff
|
From 86fc0d43cdcf3232ae0e4e6f4f28cf8f1a45ede5 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Benjamin Reed <rangerrick@befunk.com>
|
||
|
|
Date: Tue, 19 Feb 2008 17:37:37 +0100
|
||
|
|
Subject: [PATCH 04/13] This patch adds support for using -isystem to allow putting an include
|
||
|
|
directory at the end of the compiler's header search path.
|
||
|
|
|
||
|
|
I don't have the exact output anymore (I've since patched Qt's configure) but
|
||
|
|
essentially, since I have pcre.h in /opt/kde4-deps/include, it was
|
||
|
|
conflicting with Qt's (modified) pcre.h in the WebKit bits, since
|
||
|
|
-I /opt/kde4-deps/include ends up in CXXFLAGS in the generated makefiles, it
|
||
|
|
comes *before* the specific locations in INCPATH on the compile line, and you
|
||
|
|
end up with a conflict with the system-installed pcre.h.
|
||
|
|
|
||
|
|
Presumably, if your pcre.h is in /usr/include as on most Linux systems, you
|
||
|
|
wouldn't notice this issue since /usr/include's already in your include path
|
||
|
|
and people likely don't pass -I /usr/include to configure. I suspect that on
|
||
|
|
any platform with a regular, system-installed pcre.h (or clucene headers),
|
||
|
|
adding -I /usr/include would exhibit this bug, just as a custom-installed
|
||
|
|
pcre/clucene in another root would.
|
||
|
|
|
||
|
|
qt-bugs@ issue : 199610
|
||
|
|
Trolltech task ID :
|
||
|
|
bugs.kde.org number :
|
||
|
|
---
|
||
|
|
configure | 8 ++++++++
|
||
|
|
1 files changed, 8 insertions(+), 0 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/configure b/configure
|
||
|
|
index 2c108ad..610a201 100755
|
||
|
|
--- a/configure
|
||
|
|
+++ b/configure
|
||
|
|
@@ -927,6 +927,11 @@ while [ "$#" -gt 0 ]; do
|
||
|
|
VAL=`echo $1 | sed 's,-D,,'`
|
||
|
|
fi
|
||
|
|
;;
|
||
|
|
+ -isystem)
|
||
|
|
+ VAR="add_isystempath"
|
||
|
|
+ shift
|
||
|
|
+ VAL="$1"
|
||
|
|
+ ;;
|
||
|
|
-I?*|-I)
|
||
|
|
VAR="add_ipath"
|
||
|
|
if [ "$1" = "-I" ]; then
|
||
|
|
@@ -1890,6 +1895,9 @@ while [ "$#" -gt 0 ]; do
|
||
|
|
add_ipath)
|
||
|
|
I_FLAGS="$I_FLAGS -I\"${VAL}\""
|
||
|
|
;;
|
||
|
|
+ add_isystempath)
|
||
|
|
+ I_FLAGS="$I_FLAGS -isystem \"${VAL}\""
|
||
|
|
+ ;;
|
||
|
|
add_lpath)
|
||
|
|
L_FLAGS="$L_FLAGS -L\"${VAL}\""
|
||
|
|
;;
|
||
|
|
--
|
||
|
|
1.6.5.1
|
||
|
|
|