pkgs/qt/patches/0004-This-patch-adds-support-for-using-isystem-to-allow-p.patch

   1 From 86fc0d43cdcf3232ae0e4e6f4f28cf8f1a45ede5 Mon Sep 17 00:00:00 2001
   2 From: Benjamin Reed <rangerrick@befunk.com>
   3 Date: Tue, 19 Feb 2008 17:37:37 +0100
   4 Subject: [PATCH 04/13] This patch adds support for using -isystem to allow putting an include
   5  directory at the end of the compiler's header search path.
   6
   7 I don't have the exact output anymore (I've since patched Qt's configure) but
   8 essentially, since I have pcre.h in /opt/kde4-deps/include, it was
   9 conflicting with Qt's (modified) pcre.h in the WebKit bits, since
  10 -I /opt/kde4-deps/include ends up in CXXFLAGS in the generated makefiles, it
  11 comes *before* the specific locations in INCPATH on the compile line, and you
  12 end up with a conflict with the system-installed pcre.h.
  13
  14 Presumably, if your pcre.h is in /usr/include as on most Linux systems, you
  15 wouldn't notice this issue since /usr/include's already in your include path
  16 and people likely don't pass -I /usr/include to configure.  I suspect that on
  17 any platform with a regular, system-installed pcre.h (or clucene headers),
  18 adding -I /usr/include would exhibit this bug, just as a custom-installed
  19 pcre/clucene in another root would.
  20
  21 qt-bugs@ issue : 199610
  22 Trolltech task ID :
  23 bugs.kde.org number :
  24 ---
  25  configure |    8 ++++++++
  26  1 files changed, 8 insertions(+), 0 deletions(-)
  27
  28 diff --git a/configure b/configure
  29 index 2c108ad..610a201 100755
  30 --- a/configure
  31 +++ b/configure
  32 @@ -927,6 +927,11 @@ while [ "$#" -gt 0 ]; do
  33              VAL=`echo $1 | sed 's,-D,,'`
  34          fi
  35          ;;
  36 +    -isystem)
  37 +        VAR="add_isystempath"
  38 +        shift
  39 +        VAL="$1"
  40 +        ;;
  41      -I?*|-I)
  42          VAR="add_ipath"
  43          if [ "$1" = "-I" ]; then
  44 @@ -1890,6 +1895,9 @@ while [ "$#" -gt 0 ]; do
  45      add_ipath)
  46          I_FLAGS="$I_FLAGS -I\"${VAL}\""
  47          ;;
  48 +    add_isystempath)
  49 +        I_FLAGS="$I_FLAGS -isystem \"${VAL}\""
  50 +        ;;
  51      add_lpath)
  52          L_FLAGS="$L_FLAGS -L\"${VAL}\""
  53          ;;
  54 --
  55 1.6.5.1
  56