Author: lmasko Date: Sat Apr 18 09:21:48 2009 GMT Module: SOURCES Tag: HEAD ---- Log message: - Changes needed to build version 2.2.0 - first approach.
---- Files affected: SOURCES: VirtualBox-configure.patch (1.16 -> 1.17) ---- Diffs: ================================================================ Index: SOURCES/VirtualBox-configure.patch diff -u SOURCES/VirtualBox-configure.patch:1.16 SOURCES/VirtualBox-configure.patch:1.17 --- SOURCES/VirtualBox-configure.patch:1.16 Thu Jan 22 17:17:39 2009 +++ SOURCES/VirtualBox-configure.patch Sat Apr 18 11:21:43 2009 @@ -1,113 +1,27 @@ ---- VirtualBox-2.1.2_OSE/configure.orig 2009-01-21 16:07:11.000000000 +0100 -+++ VirtualBox-2.1.2_OSE/configure 2009-01-22 15:25:14.000000000 +0100 -@@ -94,11 +94,7 @@ +--- VirtualBox-2.2.0_OSE/configure.orig 2009-04-12 13:55:00.000000000 +0200 ++++ VirtualBox-2.2.0_OSE/configure 2009-04-12 14:03:10.000000000 +0200 +@@ -100,9 +100,7 @@ LIBPNG="-lpng" PKGCONFIG="`which_wrapper pkg-config`" PYTHONDIR="/usr /usr/local" --QT3DIR="/usr/qt/3 /usr/lib/qt3 /usr/lib/qt-3.3 /usr/share/qt3" --QT3DIR="$QT3DIR /usr/lib64/qt-3.3 /usr/X11R6 /usr/lib/qt" -QT4DIR="/usr/lib/qt4 /usr/share/qt4 /usr/lib64/qt4 /usr" QT4DIR_PKGCONFIG=1 -QT4UIC3DIR="/usr/bin" KBUILDDIR="`cd \`dirname $0\`; pwd`/kBuild" DEVDIR="`cd \`dirname $0\`; pwd`/tools" if [ -d "/lib/modules/`uname -r`/build" ]; then -@@ -219,8 +215,8 @@ +@@ -227,8 +225,8 @@ echo "compiling the following source file:" >> $LOG - cat .tmp_src.cc >> $LOG + cat $ODIR.tmp_src.cc >> $LOG echo "using the following command line:" >> $LOG -- echo "$CXX -O -Wall -o .tmp_out .tmp_src.cc \"$1\"" >> $LOG -- $CXX -O -Wall -o .tmp_out .tmp_src.cc $1 >> $LOG 2>&1 -+ echo "$CXX -O -Wall -o .tmp_out .tmp_src.cc -L/usr/X11R6/lib \"$1\"" >> $LOG -+ $CXX -O -Wall -o .tmp_out .tmp_src.cc -L/usr/X11R6/lib $1 >> $LOG 2>&1 +- echo "$CXX -O -Wall -o $ODIR.tmp_out $ODIR.tmp_src.cc \"$1\"" >> $LOG +- $CXX -g -O -Wall -o $ODIR.tmp_out $ODIR.tmp_src.cc $1 >> $LOG 2>&1 ++ echo "$CXX -O -Wall -o $ODIR.tmp_out $ODIR.tmp_src.cc -L/usr/X11R6/lib \"$1\"" >> $LOG ++ $CXX -g -O -Wall -o $ODIR.tmp_out $ODIR.tmp_src.cc -L/usr/X11R6/lib $1 >> $LOG 2>&1 if [ $? -ne 0 ]; then if [ -z "$4" ]; then echo -@@ -1208,37 +1204,25 @@ - } - EOF - found_qt=0 -- libs="lib" -- [ "$LIB" = "lib64" ] && libs="$libs lib64" -- for q in $QT3DIR; do -- for l in $libs; do -- echo "compiling the following source file:" >> $LOG -- cat .tmp_src.cc >> $LOG -- echo "using the following command line:" >> $LOG -- echo "$CXX -O -Wall -o .tmp_out .tmp_src.cc -I$q/include -L$q/$l -lqt-mt $LIBPTHREAD" >> $LOG -- $CXX -O -Wall -o .tmp_out .tmp_src.cc -I$q/include -L$q/$l -lqt-mt $LIBPTHREAD >> $LOG 2>&1 -- if [ $? -eq 0 ]; then -- if test_execute; then -- cnf_append "PATH_SDK_QT3" "`cd $q ; pwd`" -- found_qt=1 -- break -- fi -- fi -- done -- if [ $found_qt -eq 1 ]; then -- break -+ echo "compiling the following source file:" >> $LOG -+ cat .tmp_src.cc >> $LOG -+ echo "using the following command line:" >> $LOG -+ echo "$CXX -O -Wall -o .tmp_out .tmp_src.cc -I/usr/include/qt -L/usr/lib -lqt-mt $LIBPTHREAD" >> $LOG -+ $CXX -O -Wall -o .tmp_out .tmp_src.cc -I/usr/include/qt -L/usr/lib -lqt-mt $LIBPTHREAD >> $LOG 2>&1 -+ if [ $? -eq 0 ]; then -+ if test_execute; then -+ found_qt=1 - fi -- done -+ fi - if [ $found_qt -ne 1 ]; then - echo -- echo " Qt3 not found at \"$QT3DIR\" or Qt3 headers not found" - echo " Check the file $LOG for detailed error information." - fail - return 1 - fi - test_header "Qt3 devtools" -- if check_avail "$q/bin/moc" QT3DIR/bin; then -- moc_ver=`$q/bin/moc 2>&1 -v|sed 's+^.*(Qt \(.*\))+\1+'` -+ if check_avail "/usr/bin/moc"; then -+ moc_ver=`/usr/bin/moc 2>&1 -v|sed 's+^.*(Qt \(.*\))+\1+'` - if [ $? -ne 0 ]; then - log_failure "not found" - fail -@@ -1321,21 +1305,19 @@ - #endif - } - EOF -- for q in $QT4DIR; do -- INCQT4="$q/include $q/include/QtCore" -- FLGQT4="-DQT_SHARED" -- I_INCQT4=`prefix_I "$INCQT4"` -- LIBQT4="-L$q/lib -lVBoxQtCore" -- if test_compile "$LIBQT4 $LIBPTHREAD $I_INCQT4 $FLGQT4" qt4 qt4 nofatal; then -- foundqt4=2 -- break; -- fi -- LIBQT4="-L$q/lib -lQtCore" -- if test_compile "$LIBQT4 $LIBPTHREAD $I_INCQT4 $FLGQT4" qt4 qt4 nofatal; then -- foundqt4=1 -- break; -- fi -- done -+ INCQT4="/usr/include/qt4 /usr/include/qt/QtCore" -+ FLGQT4="-DQT_SHARED" -+ I_INCQT4=`prefix_I "$INCQT4"` -+ LIBQT4="-L/usr/lib -L/usr/lib64 -lVBoxQtCore" -+ if test_compile "$LIBQT4 $LIBPTHREAD $I_INCQT4 $FLGQT4" qt4 qt4 nofatal; then -+ foundqt4=2 -+ break; -+ fi -+ LIBQT4="-L/usr/lib -L/usr/lib64 -lQtCore" -+ if test_compile "$LIBQT4 $LIBPTHREAD $I_INCQT4 $FLGQT4" qt4 qt4 nofatal; then -+ foundqt4=1 -+ break; -+ fi - fi - fi - if [ -n "$foundqt4" ]; then -@@ -1372,7 +1354,7 @@ +@@ -1385,7 +1383,7 @@ cnf_append "VBOX_WITH_QT4_SUN" "1" fi test_header "Qt4 devtools" @@ -116,23 +30,19 @@ if which_wrapper "$q/bin/moc" > /dev/null; then moc_ver=`$q/bin/moc -v 2>&1|sed 's+^.*(Qt \(.*\))+\1+'` if [ $? -ne 0 ]; then -@@ -1796,8 +1778,6 @@ +@@ -1836,7 +1834,6 @@ --with-iasl=PATH location of the iasl compiler [$IASL] --with-linux=DIR Linux kernel source directory [$LINUX] --with-mkisofs=PATH location of mkisofs [$MKISOFS] -- --with-qt-dir=DIR directory for Qt3 headers/libraries [$QT3DIR] -- --with-qt4-dir=DIR directory for Qt4 headers/libraries [pkgconfig] - --with-gsoap-dir=PATH directory for SOAP compiler (soapcpp2 and wsdl2h) - - Build type: -@@ -1838,13 +1818,6 @@ +- --with-qt-dir=DIR directory for Qt4 headers/libraries [pkgconfig] + --with-gsoap-dir=PATH directory for gSOAP compiler/headers/libraries + (soapcpp2 and wsdl2h, soapstd2.h, libgsoap++.a/so) + --with-gsoap-import=PATH directory for gSOAP import files (stlvector.h) +@@ -1881,10 +1878,6 @@ exit 1 fi ;; -- --with-qt-dir=*) -- QT3DIR=`echo $option | cut -d'=' -f2` -- ;; -- --with-qt4-dir=*) +- --with-qt-dir=*|--with-qt4-dir=*) - QT4DIR=`echo $option | cut -d'=' -f2` - QT4DIR_PKGCONFIG=0 - ;; ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/VirtualBox-configure.patch?r1=1.16&r2=1.17&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit