projects / packages / VirtualBox.git / blame
| Commit | Line | Data |
|---|---|---|
| 41ff14a6 | 1 | diff -urN VirtualBox-2.0.0.orig/configure VirtualBox-2.0.0/configure |
| 2 | --- VirtualBox-2.0.0.orig/configure 2008-09-04 20:06:22.000000000 +0200 | |
| 3 | +++ VirtualBox-2.0.0/configure 2008-09-04 20:07:39.000000000 +0200 | |
| 4 | @@ -1401,29 +1401,7 @@ | |
| 791aa622 PS |
5 | } |
| 6 | ||
| 41ff14a6 | 7 | |
| 791aa622 PS |
8 | -# |
| 9 | -# Check whether static libstdc++ is installed | |
| 10 | -# | |
| 11 | -check_staticlibstdcxx() | |
| 12 | -{ | |
| 13 | - test_header "static stc++ library" | |
| 14 | - libstdcxx=`$CXX -print-file-name=libstdc++.a` | |
| 15 | - cat > .tmp_src.cc << EOF | |
| 16 | -#include <string> | |
| 17 | - | |
| 18 | -extern "C" int main(void) | |
| 19 | -{ | |
| 20 | - std::string s = "test"; | |
| 21 | - return 0; | |
| 22 | -} | |
| 23 | -EOF | |
| 24 | - if test_compile "$libstdcxx" libstdc++ libstdc++; then | |
| 25 | - log_success "found" | |
| 26 | - fi | |
| 27 | -} | |
| 28 | - | |
| 41ff14a6 | 29 | |
| 30 | -# | |
| 791aa622 PS |
31 | # Check for Linux sources |
| 32 | # | |
| 41ff14a6 | 33 | check_linux() |
| 34 | @@ -1996,7 +1974,6 @@ | |
| 791aa622 PS |
35 | |
| 36 | # Linux-specific | |
| 37 | if [ "$OS" = "linux" ]; then | |
| 38 | - check_staticlibstdcxx | |
| 39 | if [ $WITH_KMODS -eq 1 ]; then | |
| 40 | check_linux | |
| 41 | else | |
| 41ff14a6 | 42 | diff -urN VirtualBox-2.0.0.orig/src/VBox/Additions/x11/xclient/Makefile.kmk VirtualBox-2.0.0/src/VBox/Additions/x11/xclient/Makefile.kmk |
| 43 | --- VirtualBox-2.0.0.orig/src/VBox/Additions/x11/xclient/Makefile.kmk 2008-09-01 17:26:05.000000000 +0200 | |
| 44 | +++ VirtualBox-2.0.0/src/VBox/Additions/x11/xclient/Makefile.kmk 2008-09-04 20:07:39.000000000 +0200 | |
| 45 | @@ -74,14 +74,14 @@ | |
| 46 | # | |
| 47 | # Actually, this is darn annoying and will *NOT* be tolerated for any new code! | |
| 48 | # | |
| 49 | -VBoxClient_LIBPATH += $(PATH_TARGET)/VBoxClient | |
| 50 | -VBoxClient_ORDERDEPS = $(PATH_TARGET)/VBoxClient/libstdc++.a | |
| 51 | -VBoxClient_CLEAN = $(PATH_TARGET)/VBoxClient/libstdc++.a | |
| 52 | -$(PATH_TARGET)/VBoxClient/libstdc++.a: | |
| 53 | - $(call MSG_L1,Forcing static libstdc++) | |
| 54 | - $(QUIET)$(MKDIR) -p $(@D) | |
| 55 | - $(QUIET)$(LN_EXT) -sf `$(TOOL_$(VBOX_GCC_TOOL)_CXX) $(TEMPLATE_VBOXGUESTR3CPPEXE_CXXFLAGS.$(KBUILD_TARGET_ARCH)) -print-file-name=libstdc++.a` $@ \ | |
| 56 | - || $(CP_EXT) -f `$(TOOL_$(VBOX_GCC_TOOL)_CXX) $(TEMPLATE_VBOXGUESTR3CPPEXE_CXXFLAGS.$(KBUILD_TARGET_ARCH)) -print-file-name=libstdc++.a` $@ | |
| 57 | +#VBoxClient_LIBPATH += $(PATH_TARGET)/VBoxClient | |
| 58 | +#VBoxClient_ORDERDEPS = $(PATH_TARGET)/VBoxClient/libstdc++.a | |
| 59 | +#VBoxClient_CLEAN = $(PATH_TARGET)/VBoxClient/libstdc++.a | |
| 60 | +#$(PATH_TARGET)/VBoxClient/libstdc++.a: | |
| 61 | +# $(call MSG_L1,Forcing static libstdc++) | |
| 62 | +# $(QUIET)$(MKDIR) -p $(@D) | |
| 63 | +# $(QUIET)$(LN_EXT) -sf `$(TOOL_$(VBOX_GCC_TOOL)_CXX) $(TEMPLATE_VBOXGUESTR3CPPEXE_CXXFLAGS.$(KBUILD_TARGET_ARCH)) -print-file-name=libstdc++.a` $@ \ | |
| 64 | +# || $(CP_EXT) -f `$(TOOL_$(VBOX_GCC_TOOL)_CXX) $(TEMPLATE_VBOXGUESTR3CPPEXE_CXXFLAGS.$(KBUILD_TARGET_ARCH)) -print-file-name=libstdc++.a` $@ | |
| 65 | ||
| 66 | ||
| 67 | ifdef VBOX_X11_SEAMLESS_GUEST |