]> git.pld-linux.org Git - packages/VirtualBox.git/commitdiff
- drop obsolete files
authorArkadiusz Miśkiewicz <arekm@maven.pl>
Sun, 5 Jul 2009 17:30:52 +0000 (17:30 +0000)
committercvs2git <feedback@pld-linux.org>
Sun, 24 Jun 2012 12:13:13 +0000 (12:13 +0000)
Changed files:
    VirtualBox-disable-xclient-build.patch -> 1.6
    VirtualBox-gcc.patch -> 1.3
    VirtualBox-qt-paths.patch -> 1.10
    VirtualBox-shared-libstdc++.patch -> 1.7

VirtualBox-disable-xclient-build.patch [deleted file]
VirtualBox-gcc.patch [deleted file]
VirtualBox-qt-paths.patch [deleted file]
VirtualBox-shared-libstdc++.patch [deleted file]

diff --git a/VirtualBox-disable-xclient-build.patch b/VirtualBox-disable-xclient-build.patch
deleted file mode 100644 (file)
index d21f397..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -urN VirtualBox-2.0.0.orig/src/VBox/Additions/x11/Makefile.kmk VirtualBox-2.0.0/src/VBox/Additions/x11/Makefile.kmk
---- VirtualBox-2.0.0.orig/src/VBox/Additions/x11/Makefile.kmk  2008-09-01 17:26:06.000000000 +0200
-+++ VirtualBox-2.0.0/src/VBox/Additions/x11/Makefile.kmk       2008-09-04 20:09:32.000000000 +0200
-@@ -28,7 +28,6 @@
- # Include sub-makefiles.
- if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris)
-- include $(PATH_SUB_CURRENT)/xclient/Makefile.kmk
-  include $(PATH_SUB_CURRENT)/xgraphics/Makefile.kmk
-  include $(PATH_SUB_CURRENT)/xmouse/Makefile.kmk
- endif
diff --git a/VirtualBox-gcc.patch b/VirtualBox-gcc.patch
deleted file mode 100644 (file)
index 327ac18..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
---- configure~ 2008-08-04 23:49:45.338189943 +0200
-+++ configure  2008-08-05 08:45:58.844848232 +0200
-@@ -334,35 +334,6 @@
-         fail really
-       elif [ $cc_maj -eq 4 -a $cc_min -eq 0 -a "OS" = "darwin" ]; then
-         log_success "found version $cc_ver"
--      elif [ $cc_maj -eq 4 -a $cc_min -eq 3 ]; then
--        if [ -z "$CC_COMPAT" ]; then
--          log ""
--          log "  ** There are known problems with gcc version 4.3 when compiling the recompiler"
--          log "  ** stuff. You need to specify a compatibility compiler with version < 4.3. Look"
--          log "  ** for a package compat-gcc-34 on Fedora systems or something similar on other"
--          log "  ** distributions and call configure with parameter --with-gcc-compat=gcc34."
--          fail really
--        fi
--        if check_avail "$CC_COMPAT" CC_COMPAT really; then
--          cc_compat_ver=`$CC_COMPAT -dumpversion` 2>/dev/null
--          if [ $? -ne 0 ]; then
--            log_failure "cannot execute '$CC_COMPAT -dumpversion'"
--            fail really
--          fi
--          cc_compat_maj=`echo $cc_compat_ver|cut -d. -f1`
--          cc_compat_min=`echo $cc_compat_ver|cut -d. -f2`
--          if [ $cc_compat_maj -lt 3 \
--               -o \( $cc_compat_maj -eq 3 -a $cc_compat_min -lt 2 \) \
--               -o \( $cc_compat_maj -eq 4 -a $cc_compat_min -lt 1 \) \
--               -o \( $cc_compat_maj -eq 4 -a $cc_compat_min -gt 2 \) \
--               -o $cc_compat_maj -gt 4 ]; then
--            log ""
--            log "  ** Version $cc_compat_ver of the compatibility gcc found. Expected gcc 3.x with x>1"
--            log "  ** or gcc 4.x with 0<x<3"
--            fail really
--          fi
--          cnf_append "VBOX_RECOMPILER_OP_GCC" "$CC_COMPAT"
--        fi
-       # gcc-4.0 is allowed for Darwin only
-       elif [ $cc_maj -lt 3 \
-              -o \( $cc_maj -eq 3 -a $cc_min -lt 2 \) \
---- src/recompiler/Makefile.kmk~       2008-08-05 10:48:06.537032700 +0200
-+++ src/recompiler/Makefile.kmk        2008-08-05 10:49:59.933687528 +0200
-@@ -353,9 +353,9 @@
- # The command sans -o op.S.tmp.
--COMPILE_OP_CMDS = $(VBOX_RECOMPILER_OP_GCC) \
-+COMPILE_OP_CMDS = $(VBOX_RECOMPILER_OP_GCC_PLD_COMPAT) \
-       -S -s \
--      $(filter-out -g -O0, \
-+      $(filter-out -g -O0 -fno-stack-protector, \
-               $($(REM_MOD)_CFLAGS) $($(REM_MOD)_CFLAGS.$(KBUILD_TYPE)) $($(REM_MOD)_CFLAGS.$(KBUILD_TARGET)) $($(REM_MOD)_CFLAGS.$(KBUILD_TARGET_ARCH)) $($(REM_MOD)_CFLAGS.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)) \
-               $(target-i386/op.c_CFLAGS) $(target-i386/op.c_CFLAGS.$(KBUILD_TARGET)) $(target-i386/op.c_CFLAGS.$(KBUILD_TARGET_ARCH)) $(target-i386/op.c_CFLAGS.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)) \
-               ) \
diff --git a/VirtualBox-qt-paths.patch b/VirtualBox-qt-paths.patch
deleted file mode 100644 (file)
index 687da6b..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -urN VirtualBox-2.0.0.orig/Config.kmk VirtualBox-2.0.0/Config.kmk
---- VirtualBox-2.0.0.orig/Config.kmk   2008-09-03 20:16:30.000000000 +0200
-+++ VirtualBox-2.0.0/Config.kmk        2008-09-04 20:06:51.000000000 +0200
-@@ -1694,10 +1694,10 @@
- else
-  VBOX_PATH_QT_HOST ?= $(QTDIR)
- endif
--VBOX_UIC      ?= $(VBOX_PATH_QT_HOST)/bin/uic$(HOSTSUFF_EXE)
--VBOX_MOC      ?= $(VBOX_PATH_QT_HOST)/bin/moc$(HOSTSUFF_EXE)
--VBOX_LUPDATE  ?= $(VBOX_PATH_QT_HOST)/bin/lupdate$(HOSTSUFF_EXE)
--VBOX_LRELEASE ?= $(VBOX_PATH_QT_HOST)/bin/lrelease$(HOSTSUFF_EXE)
-+VBOX_UIC      ?= /usr/bin/uic-qt4$(HOSTSUFF_EXE)
-+VBOX_MOC      ?= /usr/bin/moc-qt4$(HOSTSUFF_EXE)
-+VBOX_LUPDATE  ?= /usr/bin/lupdate-qt4$(HOSTSUFF_EXE)
-+VBOX_LRELEASE ?= /usr/bin/lrelease-qt4$(HOSTSUFF_EXE)
- ifeq ($(KBUILD_TARGET),os2)
-  # search DLLs in the EXE directory first (unless VBOX_DLL_QT is set)
-@@ -2686,7 +2686,7 @@
- TEMPLATE_VBOXQTGUIEXE = VBox Qt GUI Executable
- TEMPLATE_VBOXQTGUIEXE_DEFS = IN_RING3 QT_NO_DEBUG QT_THREAD_SUPPORT $(ARCH_BITS_DEFS)
- TEMPLATE_VBOXQTGUIEXE_INCS = \
--      $(VBOX_PATH_QT)/include
-+      /usr/include/qt4
- ifeq ($(KBUILD_TARGET),win)
-  # drag in library configuration (we need QMAKE_PRL_DEFINES)
diff --git a/VirtualBox-shared-libstdc++.patch b/VirtualBox-shared-libstdc++.patch
deleted file mode 100644 (file)
index a5bcbe6..0000000
+++ /dev/null
@@ -1,67 +0,0 @@
-diff -urN VirtualBox-2.0.0.orig/configure VirtualBox-2.0.0/configure
---- VirtualBox-2.0.0.orig/configure    2008-09-04 20:06:22.000000000 +0200
-+++ VirtualBox-2.0.0/configure 2008-09-04 20:07:39.000000000 +0200
-@@ -1401,29 +1401,7 @@
- }
--#
--# Check whether static libstdc++ is installed
--#
--check_staticlibstdcxx()
--{
--  test_header "static stc++ library"
--  libstdcxx=`$CXX -print-file-name=libstdc++.a`
--  cat > .tmp_src.cc << EOF
--#include <string>
--
--extern "C" int main(void)
--{
--  std::string s = "test";
--  return 0;
--}
--EOF
--  if test_compile "$libstdcxx" libstdc++ libstdc++; then
--    log_success "found"
--  fi
--}
--
--#
- # Check for Linux sources
- #
- check_linux()
-@@ -1996,7 +1974,6 @@
- # Linux-specific
- if [ "$OS" = "linux" ]; then
--  check_staticlibstdcxx
-   if [ $WITH_KMODS -eq 1 ]; then
-     check_linux
-   else
-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
---- VirtualBox-2.0.0.orig/src/VBox/Additions/x11/xclient/Makefile.kmk  2008-09-01 17:26:05.000000000 +0200
-+++ VirtualBox-2.0.0/src/VBox/Additions/x11/xclient/Makefile.kmk       2008-09-04 20:07:39.000000000 +0200
-@@ -69,14 +69,14 @@
- #
- # Actually, this is darn annoying and will *NOT* be tolerated for any new code!
- #
--VBoxClient_LIBPATH  += $(PATH_VBoxClient)
--VBoxClient_ORDERDEPS = $(PATH_VBoxClient)/libstdc++.a
--VBoxClient_CLEAN     = $(PATH_VBoxClient)/libstdc++.a
--$$(PATH_VBoxClient)/libstdc++.a:
--      $(call MSG_L1,Forcing static libstdc++)
--      $(QUIET)$(MKDIR) -p $(@D)
--      $(QUIET)$(LN_EXT) -sf `$(TOOL_$(VBOX_GCC_TOOL)_CXX) $(TEMPLATE_VBOXGUESTR3CPPEXE_CXXFLAGS.$(KBUILD_TARGET_ARCH)) -print-file-name=libstdc++.a` $@ \
--           || $(CP_EXT) -f  `$(TOOL_$(VBOX_GCC_TOOL)_CXX) $(TEMPLATE_VBOXGUESTR3CPPEXE_CXXFLAGS.$(KBUILD_TARGET_ARCH)) -print-file-name=libstdc++.a` $@
-+#VBoxClient_LIBPATH  += $(PATH_VBoxClient)
-+#VBoxClient_ORDERDEPS = $(PATH_VBoxClient)/libstdc++.a
-+#VBoxClient_CLEAN     = $(PATH_VBoxClient)/libstdc++.a
-+#$$(PATH_VBoxClient)/libstdc++.a:
-+#     $(call MSG_L1,Forcing static libstdc++)
-+#     $(QUIET)$(MKDIR) -p $(@D)
-+#     $(QUIET)$(LN_EXT) -sf `$(TOOL_$(VBOX_GCC_TOOL)_CXX) $(TEMPLATE_VBOXGUESTR3CPPEXE_CXXFLAGS.$(KBUILD_TARGET_ARCH)) -print-file-name=libstdc++.a` $@ \
-+#          || $(CP_EXT) -f  `$(TOOL_$(VBOX_GCC_TOOL)_CXX) $(TEMPLATE_VBOXGUESTR3CPPEXE_CXXFLAGS.$(KBUILD_TARGET_ARCH)) -print-file-name=libstdc++.a` $@
- ifdef VBOX_X11_SEAMLESS_GUEST
This page took 0.076671 seconds and 4 git commands to generate.