SOURCES: qt4-debug-and-release.patch (NEW) - debug/release configu...

[pluto]

Author: pluto                        Date: Sun Jan 15 15:41:09 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- debug/release configure fix.

---- Files affected:
SOURCES:
   qt4-debug-and-release.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/qt4-debug-and-release.patch
diff -u /dev/null SOURCES/qt4-debug-and-release.patch:1.1
--- /dev/null	Sun Jan 15 16:41:09 2006
+++ SOURCES/qt4-debug-and-release.patch	Sun Jan 15 16:41:04 2006
@@ -0,0 +1,55 @@
+--- qt-x11-opensource-src-4.1.0/configure.orig	2006-01-15 15:40:07.943555250 +0100
++++ qt-x11-opensource-src-4.1.0/configure	2006-01-15 16:08:12.298554500 +0100
+@@ -370,7 +370,6 @@
+ CFG_QCONFIG=full
+ CFG_EMBEDDED=no
+ CFG_DEBUG=auto
+-CFG_BUILD_ALL=yes
+ CFG_DEBUG_RELEASE=no
+ CFG_SHARED=yes
+ CFG_SM=auto
+@@ -1297,14 +1296,12 @@
+ fi
+ 
+ # detect build style
+-if [ "$CFG_DEBUG_RELEASE" = "yes" ]; then
+-    QMAKE_CONFIG="$QMAKE_CONFIG build_all"
+-elif [ "$CFG_DEBUG" = "auto" ]; then
++if [ "$CFG_DEBUG" = "auto" ]; then
+     CFG_DEBUG_RELEASE=yes
+     CFG_DEBUG=yes
++fi
++if [ "$CFG_DEBUG_RELEASE" = "yes" ]; then
+     QMAKE_CONFIG="$QMAKE_CONFIG build_all"
+-else
+-    CFG_BUILD_ALL=no
+ fi
+ 
+ # if the source tree is different from the build tree,
+@@ -4168,7 +4165,16 @@
+ 
+ [ "$CFG_INCREMENTAL" = "yes" ] && [ '!' -z "$INCREMENTAL" ] && echo "Incremental ......... $INCREMENTAL"
+ echo "Configuration ....... $QMAKE_CONFIG $QT_CONFIG"
+-echo "Debug................ $CFG_DEBUG"
++if [ "$CFG_DEBUG_RELEASE" = "yes" ]; then
++   echo "Debug................ yes (combined)"
++   if [ "$CFG_DEBUG" = "yes" ]; then
++       echo "Default Link......... debug"
++   else
++       echo "Default Link......... release"
++   fi
++else
++   echo "Debug................ $CFG_DEBUG"
++fi
+ echo "Qt3 compatibility.... $CFG_QT3SUPPORT"
+ echo "STL support ......... $CFG_STL"
+ echo "PCH support ......... $CFG_PRECOMPILE"
+@@ -4446,7 +4452,7 @@
+ # WARNING: This makefile will be replaced with a real makefile.
+ # All changes made to this file will be lost.
+ EOF
+-            [ "$CFG_BUILD_ALL" = "no" ] && echo "first_target: first" >>${OUTDIR}/Makefile
++            [ "$CFG_DEBUG_RELEASE" = "no" ] && echo "first_target: first" >>${OUTDIR}/Makefile
+         
+             cat >>${OUTDIR}/Makefile <<EOF
+ all clean install qmake first Makefile: FORCE
================================================================