[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-devel
Subject:    qt-copy patch, bugzilla prob? (2)
From:       Allan Fields <kde () afields ! ca>
Date:       2005-08-04 7:00:25
Message-ID: 20050804070025.GA3075 () afields ! ca
[Download RAW message or body]

[Attached is patch, sorry]

Attached is qt-copy.patch for configure and fvisibility test to
prevent writing to source tree w/ separate outdir specfication.

Someone else should make configure.in patch and possibly comitt
upstream.

I couldn't submit to bugzilla, bugs.kde.org allows me to log in but
even though I accept cookies from bugs.kde.org it says I have to
have cookies enabled.  I'm not behind a proxy either.

-- 
Allan Fields 


["qt-copy.patch" (text/plain)]

--- qt-copy/configure.orig	Thu Aug  4 00:45:56 2005
+++ qt-copy/configure	Thu Aug  4 01:26:06 2005
@@ -1751,7 +1751,7 @@
 
 # auto-detect -fvisibility support
 if [ "$CFG_REDUCE_EXPORTS" = "auto" ]; then
-    if $unixtests/fvisibility.test $XQMAKESPEC $OPT_VERBOSE; then
+    if $unixtests/fvisibility.test $XQMAKESPEC $OPT_VERBOSE $outpath; then
        CFG_REDUCE_EXPORTS=no
     else
        CFG_REDUCE_EXPORTS=yes
@@ -2679,8 +2679,8 @@
     done
 
     #mkspecs/default is used as a (gasp!) default mkspec so QMAKESPEC needn't be set once configured
-    rm -f mkspecs/default
-    ln -s `echo $XQMAKESPEC | sed "s,^${relpath}/mkspecs/,,"` mkspecs/default
+    rm -f $outpath/mkspecs/default
+    ln -s `echo $XQMAKESPEC | sed "s,^${relpath}/mkspecs/,,"` $outpath/mkspecs/default
     # fix makefiles
     for mkfile in GNUmakefile Makefile; do
         EXTRA_LFLAGS=
@@ -3740,14 +3740,15 @@
 # .projects.1    -> qt and moc
 # .projects.2    -> subdirs and libs
 # .projects.3    -> the rest
+cd ${outpath}
 rm -f .projects .projects.1 .projects.2 .projects.3
 
 if [ -z "$AWK" ]; then
     for p in `echo $QMAKE_PROJECTS`; do
-        echo $p >> .projects
+        echo $p >> ${outpath}/.projects
     done
 else
-    cat >projects.awk <<EOF
+    cat >${outpath}/projects.awk <<EOF
 BEGIN {
     files = 0
     target_file = ""

--- qt-copy/config.tests/unix/fvisibility.test.orig	Thu Aug  4 00:00:03 2005
+++ qt-copy/config.tests/unix/fvisibility.test	Thu Aug  4 00:47:15 2005
@@ -4,8 +4,10 @@
 XPLATFORM=`basename $1`
 XCONFIG=$1/qmake.conf
 VERBOSE=$2
-OUTDIR=$4
+OUTDIR=$3
 
+test -d $OUTDIR/config.tests/unix/fvisibility|| mkdir -p $OUTDIR/config.tests/unix/fvisibility
+cd $OUTDIR/config.tests/unix/fvisibility
 cat >>fvisibility.c << EOF
 __attribute__((visibility("default"))) void blah();
 #if defined(__GNUC__) && __GNUC__ < 4


 =

>> Visit http://mail.kde.org/mailman/listinfo/kde-devel#unsub to unsubscrib=
e <<


[prev in list] [next in list] [prev in thread] [next in thread]