]>
Commit | Line | Data |
---|---|---|
acf12a87 AM |
1 | Description: Do not include statically linked libstdc++. |
2 | Not a good idea if we don't need to be binary-compatible across exotic | |
3 | distribution. Doesn't work with trunk glibc heading towards 2.11 anyways. | |
4 | Static linking is not really supported anyways. | |
5 | Author: Lubomir Rintel <lkundrak@v3.sk> | |
6 | Origin: http://cvs.rpmfusion.org/viewvc/rpms/VirtualBox-OSE/devel/VirtualBox-OSE-3.1.0-libcxx.patch?root=free&view=markup | |
7 | ||
8 | diff -urNad virtualbox-ose-3.1.0-dfsg~/src/VBox/Additions/x11/VBoxClient/Makefile.kmk virtualbox-ose-3.1.0-dfsg/src/VBox/Additions/x11/VBoxClient/Makefile.kmk | |
9 | --- virtualbox-ose-3.1.0-dfsg~/src/VBox/Additions/x11/VBoxClient/Makefile.kmk 2009-10-07 11:27:13.000000000 +0200 | |
10 | +++ virtualbox-ose-3.1.0-dfsg/src/VBox/Additions/x11/VBoxClient/Makefile.kmk 2009-10-07 18:44:29.962989537 +0200 | |
11 | @@ -69,20 +69,6 @@ | |
12 | ifdef VBOX_WITH_GUEST_PROPS | |
13 | VBoxClient_DEFS += VBOX_WITH_GUEST_PROPS | |
14 | endif | |
15 | -# | |
16 | -# Link against libstdc++.a. (http://www.trilithium.com/johan/2005/06/static-libstdc/). | |
17 | -# (It would've been preferred to avoid features depending on libstdc++, of course...) | |
18 | -# | |
19 | -# Actually, this is darn annoying and will *NOT* be tolerated for any new code! | |
20 | -# | |
21 | -VBoxClient_LIBPATH += $(VBoxClient_0_OUTDIR) | |
22 | -VBoxClient_ORDERDEPS = $(VBoxClient_0_OUTDIR)/libstdc++.a | |
23 | -VBoxClient_CLEAN = $(VBoxClient_0_OUTDIR)/libstdc++.a | |
24 | -$$(VBoxClient_0_OUTDIR)/libstdc++.a: | |
25 | - $(call MSG_L1,Forcing static libstdc++) | |
26 | - $(QUIET)$(MKDIR) -p $(@D) | |
27 | - $(QUIET)$(LN_EXT) -sf `$(TOOL_$(VBOX_GCC_TOOL)_CXX) $(TEMPLATE_VBOXGUESTR3CPPEXE_CXXFLAGS.$(KBUILD_TARGET_ARCH)) -print-file-name=libstdc++.a` $@ \ | |
28 | - || $(CP_EXT) -f `$(TOOL_$(VBOX_GCC_TOOL)_CXX) $(TEMPLATE_VBOXGUESTR3CPPEXE_CXXFLAGS.$(KBUILD_TARGET_ARCH)) -print-file-name=libstdc++.a` $@ | |
29 | ||
30 | ifdef VBOX_X11_SEAMLESS_GUEST | |
31 | if defined(VBOX_WITH_TESTCASES) && !defined(VBOX_ONLY_ADDITIONS) && !defined(VBOX_ONLY_SDK) |