Author: arvenil Date: Mon Dec 31 13:57:12 2007 GMT Module: SOURCES Tag: HEAD ---- Log message: - up to 1.5.4
---- Files affected: SOURCES: VirtualBox-configure.patch (1.5 -> 1.6) , VirtualBox-shared-libstdc++.patch (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SOURCES/VirtualBox-configure.patch diff -u SOURCES/VirtualBox-configure.patch:1.5 SOURCES/VirtualBox-configure.patch:1.6 --- SOURCES/VirtualBox-configure.patch:1.5 Wed Oct 24 14:58:55 2007 +++ SOURCES/VirtualBox-configure.patch Mon Dec 31 14:57:06 2007 @@ -4,7 +4,7 @@ LIBZ="-lz" INCPNG="" LIBPNG="-lpng" --QTDIR="/usr/qt/3 /usr/lib/qt3 /usr/lib/qt-3.3 /usr/share/qt3 /usr/lib64/qt-3.3 /usr/X11R6" +-QTDIR="/usr/qt/3 /usr/lib/qt3 /usr/lib/qt-3.3 /usr/share/qt3 /usr/lib64/qt-3.3 /usr/X11R6 /usr/lib/qt" KBUILDDIR="`cd \`dirname $0\`; pwd`/kBuild" DEVDIR="`cd \`dirname $0\`; pwd`/tools" if [ -d "/lib/modules/`uname -r`/build" ]; then ================================================================ Index: SOURCES/VirtualBox-shared-libstdc++.patch diff -u SOURCES/VirtualBox-shared-libstdc++.patch:1.1 SOURCES/VirtualBox-shared-libstdc++.patch:1.2 --- SOURCES/VirtualBox-shared-libstdc++.patch:1.1 Sat Sep 29 22:40:53 2007 +++ SOURCES/VirtualBox-shared-libstdc++.patch Mon Dec 31 14:57:07 2007 @@ -1,18 +1,17 @@ -diff -urN VirtualBox-1.5.0_OSE.orig/src/VBox/Additions/linux/xclient/Makefile.kmk VirtualBox-1.5.0_OSE/src/VBox/Additions/linux/xclient/Makefile.kmk ---- VirtualBox-1.5.0_OSE.orig/src/VBox/Additions/linux/xclient/Makefile.kmk 2007-08-30 17:16:27.000000000 +0200 -+++ VirtualBox-1.5.0_OSE/src/VBox/Additions/linux/xclient/Makefile.kmk 2007-09-29 20:05:24.000000000 +0200 +--- VirtualBox-1.5.4_OSE/src/VBox/Additions/linux/xclient/Makefile.kmk 2007-12-30 17:02:00.000000000 +0000 ++++ VirtualBox-1.5.4_OSE/src/VBox/Additions/linux/xclient/Makefile.kmk 2007-12-30 17:05:37.000000000 +0000 @@ -32,10 +32,10 @@ vboxadd-xclient_DEFS = _GNU_SOURCE VBOX_HGCM # link agaginst libstdc++.a (http://www.trilithium.com/johan/2005/06/static-libstdc/) -$(PATH_TARGET)/vboxadd-xclient/vboxadd-xclient: $(PATH_TARGET)/vboxadd-xclient/libstdc++.a -+# $(PATH_TARGET)/vboxadd-xclient/vboxadd-xclient: $(PATH_TARGET)/vboxadd-xclient/libstdc++.a ++#$(PATH_TARGET)/vboxadd-xclient/vboxadd-xclient: $(PATH_TARGET)/vboxadd-xclient/libstdc++.a -$(PATH_TARGET)/vboxadd-xclient/libstdc++.a: - $(call MSG_L1,Forcing static libstdc++) -- $(QUIET)ln -s `$(TOOL_$(VBOX_GCC32_TOOL)_CXX) -print-file-name=libstdc++.a` $@ || cp `$(TOOL_$(VBOX_GCC32_TOOL)_CXX) -print-file-name=libstdc++.a` $@ -+# $(PATH_TARGET)/vboxadd-xclient/libstdc++.a: -+# $(call MSG_L1,Forcing static libstdc++) -+# $(QUIET)ln -s `$(TOOL_$(VBOX_GCC32_TOOL)_CXX) -print-file-name=libstdc++.a` $@ || cp `$(TOOL_$(VBOX_GCC32_TOOL)_CXX) -print-file-name=libstdc++.a` $@ +- $(QUIET)ln -sf `$(TOOL_$(VBOX_GCC32_TOOL)_CXX) -print-file-name=libstdc++.a` $@ || cp `$(TOOL_$(VBOX_GCC32_TOOL)_CXX) -print-file-name=libstdc++.a` $@ ++#$(PATH_TARGET)/vboxadd-xclient/libstdc++.a: ++# $(call MSG_L1,Forcing static libstdc++) ++# $(QUIET)ln -sf `$(TOOL_$(VBOX_GCC32_TOOL)_CXX) -print-file-name=libstdc++.a` $@ || cp `$(TOOL_$(VBOX_GCC32_TOOL)_CXX) -print-file-name=libstdc++.a` $@ include $(PATH_KBUILD)/footer.kmk ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/VirtualBox-configure.patch?r1=1.5&r2=1.6&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/VirtualBox-shared-libstdc++.patch?r1=1.1&r2=1.2&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
