Changeset 59355 in vbox

Timestamp:

Jan 15, 2016 2:22:57 AM (9 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

105039

Message:

/Makefile.kmk,Config.kmk: Fixed resigning of x86\msvcr*.dll, seems we've been shipping AMD64 binaries there...

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• Makefile.kmk (modified) (2 diffs)

trunk/Config.kmk

@@ -3013 +3013 @@
 # @param    1   Target name.
 # @param    2   The source name.
+# @param    3   Optional prefix to avoid name collisions.
 #
 if defined(VBOX_SIGNING_MODE) && "$(KBUILD_TARGET)" == "win"
- VBOX_RE_SIGN_DLL_FN = $(if-expr !defined($(1)_VBOX_RE_SIGNED_$(notdir $(2))),\
-        $(evalcall VBOX_RE_SIGN_DLL_INTERNAL_FN,$1,$2)\
-        ,)$($(1)_0_OUTDIR)/$(notdir $2)
+ VBOX_RE_SIGN_DLL_FN = $(if-expr !defined($(1)_VBOX_RE_SIGNED_$(3)$(notdir $(2))),\
+        $(evalcall VBOX_RE_SIGN_DLL_INTERNAL_FN,$1,$2,$3)\
+        ,)$($(1)_0_OUTDIR)/$(3)$(notdir $2)
 
 define VBOX_RE_SIGN_DLL_INTERNAL_FN
-local n = $(notdir $2)
+local n = $(3)$(notdir $2)
 ifndef $(1)_VBOX_RE_SIGNED_$(n)
  $(1)_VBOX_RE_SIGNED_$(n) := 1

trunk/Makefile.kmk

@@ -124 +124 @@
  ifdef VBOX_WITH_32_ON_64_MAIN_API
   InstallExternalLibs_SOURCES += \
-        $(call VBOX_RE_SIGN_DLL_FN,InstallExternalLibs,$(VBOX_PATH_VCC_REDIST_CRT_X86)/msvcr$(substr $(VBOX_VCC_TOOL_STEM),4).dll)=>x86/msvcr$(substr $(VBOX_VCC_TOOL_STEM),4).dll \
-        $(call VBOX_RE_SIGN_DLL_FN,InstallExternalLibs,$(VBOX_PATH_VCC_REDIST_CRT_X86)/msvcp$(substr $(VBOX_VCC_TOOL_STEM),4).dll)=>x86/msvcp$(substr $(VBOX_VCC_TOOL_STEM),4).dll
+        $(call VBOX_RE_SIGN_DLL_FN,InstallExternalLibs,$(VBOX_PATH_VCC_REDIST_CRT_X86)/msvcr$(substr $(VBOX_VCC_TOOL_STEM),4).dll,x86_)=>x86/msvcr$(substr $(VBOX_VCC_TOOL_STEM),4).dll \
+        $(call VBOX_RE_SIGN_DLL_FN,InstallExternalLibs,$(VBOX_PATH_VCC_REDIST_CRT_X86)/msvcp$(substr $(VBOX_VCC_TOOL_STEM),4).dll,x86_)=>x86/msvcp$(substr $(VBOX_VCC_TOOL_STEM),4).dll
  endif
  ifeq ($(VBOX_VCC_CRT_TYPE),d)
@@ -135 +135 @@
   ifdef VBOX_WITH_32_ON_64_MAIN_API
   InstallExternalLibs_SOURCES += \
-        $(call VBOX_RE_SIGN_DLL_FN,InstallExternalLibs,$(VBOX_PATH_VCC_REDIST_CRT_DBG_X86)/msvcr$(substr $(VBOX_VCC_TOOL_STEM)d,4).dll)=>x86/msvcr$(substr $(VBOX_VCC_TOOL_STEM),4)d.dll \
-        $(call VBOX_RE_SIGN_DLL_FN,InstallExternalLibs,$(VBOX_PATH_VCC_REDIST_CRT_DBG_X86)/msvcp$(substr $(VBOX_VCC_TOOL_STEM)d,4).dll)=>x86/msvcp$(substr $(VBOX_VCC_TOOL_STEM),4)d.dll
+        $(call VBOX_RE_SIGN_DLL_FN,InstallExternalLibs,$(VBOX_PATH_VCC_REDIST_CRT_DBG_X86)/msvcr$(substr $(VBOX_VCC_TOOL_STEM)d,4).dll,x86_)=>x86/msvcr$(substr $(VBOX_VCC_TOOL_STEM),4)d.dll \
+        $(call VBOX_RE_SIGN_DLL_FN,InstallExternalLibs,$(VBOX_PATH_VCC_REDIST_CRT_DBG_X86)/msvcp$(substr $(VBOX_VCC_TOOL_STEM)d,4).dll,x86_)=>x86/msvcp$(substr $(VBOX_VCC_TOOL_STEM),4)d.dll
   endif
  endif