Changeset 83033 in vbox for trunk/Makefile.kmk

Timestamp:

Feb 10, 2020 1:40:54 PM (5 years ago)

Author:

vboxsync

Message:

/Config.kmk,/Makefile.kmk,Installer/darwin,FE/QT,SUPHard: Eliminated the symlinks under Resources/VirtualBoxVM.app to avoid confusing codesign and notarization. bugref:9466
Note! Best to do a clean build on mac (or at a minimum rm -Rf out/darwin.amd64/*/dist/VirtualBox.app/Contents/Frameworks/ out/darwin.amd64/*/dist/VirtualBox.app/Contents/plugins/).

• SUPHard: Added new location SUPSECMAIN_FLAGS_LOC_OSX_HLP_APP (darwin only) for indicating a helper application and that hardened dylib and the rest of VirtualBox isn't in the executable directory.
• SUPHard: Added a corresponding internal path ID kSupID_AppMacHelper (darwin only) for finding VirtualBoxVM for verification now that it is no longer in the main app binary directory.
• /Config.kmk: Run install_name_tool after linking Qt binaries on darwin fix the Qt import paths (@executable_path/../Frameworks/ doesn't work for VirtualBoxVM any more).
• /Makefile.kmk: Run install_name_tool during installation of Qt frameworks and plugins to use @rpath in non-hardened builds and the absolute paths in hardened ones (latter done by Installer/darwin/Makefile.kmk previously).
• FE/Qt,Installer/darwin: Adjustments and path hacks.

File:

• trunk/Makefile.kmk (modified) (1 diff)

trunk/Makefile.kmk

@@ -179 +179 @@
         Frameworks/$(qtmod).framework/$(qtmod)=>Versions/5/$(qtmod) \
         Frameworks/$(qtmod).framework/Resources=>Versions/5/Resources)
+ qt5-bin_INSTALLER = $(INSTALL) $(if $(uid),-o $(uid)) $(if $(gid),-g $(gid)) $(if $(mode),-m $(mode)) $(4) -- \
+                        "$(1)" "$(2)" $(if-expr "$(source_type_prefix)" == "EXEC_" \
+                        ,$(NLTAB)install_name_tool \
+                        $(if-expr "$(suffix $2)" == "", -id "$(if $(VBOX_WITH_HARDENING),/Applications/VirtualBox.app/Contents/Framework,@rpath)/$(notdir $(2)).framework/Version/5/$(notdir $(2))",) \
+                        $(foreach qtmod, $(VBOX_QT_MOD_NAMES), \
+                                $(foreach prefix, @executable_path/../Frameworks/ $(VBOX_PATH_QT)/Frameworks/ $(PATH_SDK_QT)/, \
+                                -change "$(prefix)$(qtmod).framework/Versions/5/$(qtmod)" \
+                                        "$(if $(VBOX_WITH_HARDENING),/Applications/VirtualBox.app/Contents/Frameworks,@rpath)/$(qtmod).framework/Versions/5/$(qtmod)" ) ) \
+                        "$(2)",) # HACK ALERT! Using $(source_type_prefix) to detect EXEC_SOURCES.
 else # win x11
  if1of ($(KBUILD_TARGET), linux solaris)