[47699] trunk/dports/aqua/qt4-mac

[mcalhoun at macports.org]

Revision: 47699
          http://trac.macports.org/changeset/47699
Author:   mcalhoun at macports.org
Date:     2009-03-03 16:18:28 -0800 (Tue, 03 Mar 2009)
Log Message:
-----------
qt4-mac: Replace -I with -isystem in all cases to prevent including the wrong file.
Fixes #18723.

Modified Paths:
--------------
    trunk/dports/aqua/qt4-mac/Portfile

Added Paths:
-----------
    trunk/dports/aqua/qt4-mac/files/patch-configure.diff

Modified: trunk/dports/aqua/qt4-mac/Portfile
===================================================================
--- trunk/dports/aqua/qt4-mac/Portfile	2009-03-03 23:52:01 UTC (rev 47698)
+++ trunk/dports/aqua/qt4-mac/Portfile	2009-03-04 00:18:28 UTC (rev 47699)
@@ -38,7 +38,7 @@
     port:openssl                           \
     port:sqlite3
 
-patchfiles          patch-compile.test.diff patch-mac.conf.diff
+patchfiles          patch-compile.test.diff patch-mac.conf.diff patch-configure.diff
 
 # have to build with Apple gcc because of -fconstant-cfstrings
 # configure.compiler should therefore not be one of the MacPorts compilers
@@ -56,10 +56,8 @@
 #   http://doc.trolltech.com/qtopia4.3/buildsystem/over-configure-options-qt-1.html
 # for options
 #
-# -I${prefix}/include should be set in ${configure.args}, but
-#    we instead patch -isystem ${prefix}/include into the configure
-#    script to avoid conflicts with other ports (e.g. pcre).
-# See http://trac.macports.org/ticket/15219
+# -isystem is used instead of -I to avoid conflicts with other ports (e.g. pcre).
+#  See http://trac.macports.org/ticket/15219 and http://trac.macports.org/ticket/18723.
 #
 # -dbus-linked prevends qt4 from trying to dynamically load libdbus-1,
 #     which it is not able to find in ${prefix}
@@ -76,8 +74,9 @@
     -system-sqlite                                             \
     -openssl-linked                                            \
     -dbus-linked                                               \
-    -I${prefix}/include/mysql5/mysql                           \
-    -I${prefix}/include/postgresql83                           \
+    -isystem${prefix}/include                                  \
+    -isystem${prefix}/include/mysql5/mysql                     \
+    -isystem${prefix}/include/postgresql83                     \
     -L${prefix}/lib                                            \
     -L${prefix}/lib/mysql5/mysql                               \
     -L${prefix}/lib/postgresql83
@@ -88,10 +87,6 @@
 destroot.destdir    INSTALL_ROOT="${destroot}"
 
 post-patch {
-    # configure script only accepts -I..., but we want -isystem...
-    reinplace -E "s|^I_FLAGS=\$|I_FLAGS=-isystem${prefix}/include|" \
-        ${worksrcpath}/configure
-
     # ensure that the MacPorts odbc is used
     reinplace "s|-liodbc|-lodbc|" \
         ${worksrcpath}/src/plugins/sqldrivers/odbc/odbc.pro

Added: trunk/dports/aqua/qt4-mac/files/patch-configure.diff
===================================================================
--- trunk/dports/aqua/qt4-mac/files/patch-configure.diff	                        (rev 0)
+++ trunk/dports/aqua/qt4-mac/files/patch-configure.diff	2009-03-04 00:18:28 UTC (rev 47699)
@@ -0,0 +1,28 @@
+--- configure.orig	2009-03-03 18:48:59.000000000 -0500
++++ configure	2009-03-03 18:50:00.000000000 -0500
+@@ -802,6 +802,15 @@
+             VAL=`echo $1 | sed 's,-I,,'`
+         fi
+         ;;
++    -isystem?*|-isystem)
++        VAR="add_ipath_system"
++        if [ "$1" = "-isystem" ]; then
++            shift
++            VAL="$1"
++        else
++            VAL=`echo $1 | sed 's,-isystem,,'`
++        fi
++        ;;
+     -L?*|-L)
+         VAR="add_lpath"
+         if [ "$1" = "-L" ]; then
+@@ -1700,6 +1709,9 @@
+     add_ipath)
+         I_FLAGS="$I_FLAGS -I\"${VAL}\""
+         ;;
++    add_ipath_system)
++        I_FLAGS="$I_FLAGS -isystem\"${VAL}\""
++        ;;
+     add_lpath)
+         L_FLAGS="$L_FLAGS -L\"${VAL}\""
+         ;;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090303/8ad99906/attachment.html>