projects / packages / VirtualBox.git / blame
| Commit | Line | Data |
|---|---|---|
| 6cd758ac | 1 | --- VirtualBox-1.6.0_OSE/src/VBox/Additions/x11/xclient/Makefile.kmk 2008-04-30 16:05:59.000000000 +0200 |
| 2 | +++ VirtualBox-1.6.0_OSE/src/VBox/Additions/x11/xclient/Makefile.kmk 2008-05-05 09:42:04.000000000 +0200 | |
| 3 | @@ -63,14 +63,14 @@ | |
| 4 | # Link aginst libstdc++.a. (http://www.trilithium.com/johan/2005/06/static-libstdc/). | |
| 5 | # (It would've been preferred to avoid features depending on libstdc++, of course...) | |
| 6 | # | |
| 7 | -VBoxClient_LIBPATH += $(PATH_TARGET)/VBoxClient | |
| 8 | -VBoxClient_ORDERDEPS = $(PATH_TARGET)/VBoxClient/libstdc++.a | |
| 9 | -VBoxClient_CLEAN = $(PATH_TARGET)/VBoxClient/libstdc++.a | |
| 10 | -$(PATH_TARGET)/VBoxClient/libstdc++.a: | |
| 27386913 | 11 | - $(call MSG_L1,Forcing static libstdc++) |
| 6cd758ac | 12 | - $(QUIET)$(MKDIR) -p $(@D) |
| 13 | - $(QUIET)$(LN_EXT) -sf `$(TOOL_$(VBOX_GCC32_TOOL)_CXX) -print-file-name=libstdc++.a` $@ \ | |
| 14 | - || $(CP_EXT) -f `$(TOOL_$(VBOX_GCC32_TOOL)_CXX) -print-file-name=libstdc++.a` $@ | |
| 15 | +#VBoxClient_LIBPATH += $(PATH_TARGET)/VBoxClient | |
| 16 | +#VBoxClient_ORDERDEPS = $(PATH_TARGET)/VBoxClient/libstdc++.a | |
| 17 | +#VBoxClient_CLEAN = $(PATH_TARGET)/VBoxClient/libstdc++.a | |
| 18 | +#$(PATH_TARGET)/VBoxClient/libstdc++.a: | |
| 87bb5f90 | 19 | +# $(call MSG_L1,Forcing static libstdc++) |
| 6cd758ac | 20 | +# $(QUIET)$(MKDIR) -p $(@D) |
| 21 | +# $(QUIET)$(LN_EXT) -sf `$(TOOL_$(VBOX_GCC32_TOOL)_CXX) -print-file-name=libstdc++.a` $@ \ | |
| 22 | +# || $(CP_EXT) -f `$(TOOL_$(VBOX_GCC32_TOOL)_CXX) -print-file-name=libstdc++.a` $@ | |
| 23 | ||
| 27386913 | 24 | |
| 6cd758ac | 25 | ifdef VBOX_X11_SEAMLESS_GUEST |
| 791aa622 PS |
26 | --- VirtualBox-1.6.0_OSE/configure.orig 2008-05-12 10:07:04.000000000 +0200 |
| 27 | +++ VirtualBox-1.6.0_OSE/configure 2008-05-12 10:09:23.000000000 +0200 | |
| 28 | @@ -1302,28 +1302,6 @@ | |
| 29 | fi | |
| 30 | } | |
| 31 | ||
| 32 | - | |
| 33 | -# | |
| 34 | -# Check whether static libstdc++ is installed | |
| 35 | -# | |
| 36 | -check_staticlibstdcxx() | |
| 37 | -{ | |
| 38 | - test_header "static stc++ library" | |
| 39 | - libstdcxx=`$CXX -print-file-name=libstdc++.a` | |
| 40 | - cat > .tmp_src.cc << EOF | |
| 41 | -#include <string> | |
| 42 | - | |
| 43 | -extern "C" int main(void) | |
| 44 | -{ | |
| 45 | - std::string s = "test"; | |
| 46 | - return 0; | |
| 47 | -} | |
| 48 | -EOF | |
| 49 | - if test_compile "$libstdcxx" libstdc++ libstdc++; then | |
| 50 | - log_success "found" | |
| 51 | - fi | |
| 52 | -} | |
| 53 | - | |
| 54 | # | |
| 55 | # Check for Linux sources | |
| 56 | # | |
| 57 | @@ -1816,7 +1794,6 @@ | |
| 58 | ||
| 59 | # Linux-specific | |
| 60 | if [ "$OS" = "linux" ]; then | |
| 61 | - check_staticlibstdcxx | |
| 62 | if [ $WITH_KMODS -eq 1 ]; then | |
| 63 | check_linux | |
| 64 | else |