儲存庫 vbox 的更動 12145

時間撮記:

2008-9-5 下午04:18:44 (16 年 以前)

作者:

vboxsync

訊息:

better 64-bit Python module target

檔案:

• trunk/src/VBox/Installer/solaris/Makefile.kmk (修改) (5 筆差異)

trunk/src/VBox/Installer/solaris/Makefile.kmk

@@ -25 +25 @@
 ifneq ($(KBUILD_HOST),solaris)
 $(error "The Solaris installer can only be built on Solaris!") # yeah, right.
+endif
+
+ifeq  ($(KBUILD_ARCH),amd64)
+PYTHON_MOD_PREFIX=64/
 endif
 
@@ -90 +94 @@
         $(if $(VBOX_WITH_QT4GUI),libVBoxQtGui.so.4,) \
         $(if $(VBOX_WITH_DEBUGGER_GUI),VBoxDbg.so,) \
-        $(if $(VBOX_WITH_PYTHON),$(if $(findstring amd64,$(KBUILD_ARCH)),64/VBoxPython.so,VBoxPython.so),) \
+        $(if $(VBOX_WITH_PYTHON),$(PYTHON_MOD_PREFIX)VBoxPython.so,) \
         VBoxSettings.so \
         components/VBoxC.so \
@@ -280 +284 @@
         $(QUIET)$(if $(VBOX_WITH_QT4GUI),$(INSTALL) -m 0755 $(PATH_DEVTOOLS_TRG)/qt/v4.3.3-r1/bin/qtconfig         $(SOLARIS_INST_DIR)/VBoxQtconfig,)
         $(QUIET)$(if $(VBOX_WITH_DEBUGGER_GUI),$(INSTALL) -m 0644 $(PATH_BIN)/VBoxDbg.so                        $(SOLARIS_INST_DIR)/VBoxDbg.so,)
-        $(QUIET)$(if $(VBOX_WITH_PYTHON),$(INSTALL) -m 0644 $(PATH_BIN)/VBoxPython.so                           $(SOLARIS_INST_DIR)/VBoxPython.so,)
+        $(QUIET)$(if $(VBOX_WITH_PYTHON),$(INSTALL) -m 0644 $(PATH_BIN)/$(PYTHON_MOD_PREFIX)VBoxPython.so                           $(SOLARIS_INST_DIR)/$(PYTHON_MOD_PREFIX)VBoxPython.so,)
         $(QUIET)$(INSTALL) -m 0644 $(PATH_BIN)/VBoxSettings.so                                                  $(SOLARIS_INST_DIR)/VBoxSettings.so
         $(QUIET)$(INSTALL) -m 0644 $(PATH_BIN)/components/VBoxC.so                                              $(SOLARIS_INST_DIR)/components/VBoxC.so
@@ -330 +334 @@
         $(QUIET)$(if $(VBOX_DO_STRIP),$(if $(VBOX_WITH_QT4GUI),strip $(SOLARIS_INST_DIR)/VBoxQtconfig,),)
         $(QUIET)$(if $(VBOX_DO_STRIP),$(if $(VBOX_WITH_DEBUGGER_GUI),strip $(SOLARIS_INST_DIR)/VBoxDbg.so,),)
-        $(QUIET)$(if $(VBOX_DO_STRIP),$(if $(VBOX_WITH_PYTHON),strip $(SOLARIS_INST_DIR)/VBoxPython.so,),)
+        $(QUIET)$(if $(VBOX_DO_STRIP),$(if $(VBOX_WITH_PYTHON),strip $(SOLARIS_INST_DIR)/$(PYTHON_MOD_PREFIX)VBoxPython.so,),)
         $(QUIET)$(if $(VBOX_DO_STRIP),strip $(SOLARIS_INST_DIR)/VBoxSettings.so,)
         $(QUIET)$(if $(VBOX_DO_STRIP),strip $(SOLARIS_INST_DIR)/components/VBoxC.so,)
@@ -468 +472 @@
         $(QUIET)$(if $(VBOX_WITH_QTGUI),$(SOL_DBG_OBJCOPY) $(PATH_BIN)/VirtualBox3.so                             $(SOLARIS_DBG_DIR)/VirtualBox3.so,)
 endif
-        $(QUIET)$(if $(VBOX_WITH_PYTHON),$(SOL_DBG_OBJCOPY) $(PATH_BIN)/VBoxPython.so                             $(SOLARIS_DBG_DIR)/VBoxPython.so,)
+        $(QUIET)$(if $(VBOX_WITH_PYTHON),$(SOL_DBG_OBJCOPY) $(PATH_BIN)/$(PYTHON_MOD_PREFIX)VBoxPython.so                             $(SOLARIS_DBG_DIR)/$(PYTHON_MOD_PREFIX)VBoxPython.so,)
         $(QUIET)$(SOL_DBG_OBJCOPY) $(PATH_BIN)/VBoxSettings.so                                                    $(SOLARIS_DBG_DIR)/VBoxSettings.so
         $(QUIET)$(SOL_DBG_OBJCOPY) $(PATH_BIN)/components/VBoxC.so                                                $(SOLARIS_DBG_DIR)/components/VBoxC.so