- Timestamp:
- Mar 21, 2016 12:00:57 PM (9 years ago)
- Location:
- trunk
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Config.kmk
r60072 r60117 5239 5239 ifndef VBOX_WITH_QTGUI_V5 5240 5240 VBOX_PATH_QT := $(lastword $(sort $(wildcard $(KBUILD_DEVTOOLS_TRG)/qt/v4*))) 5241 else # VBOX_WITH_QTGUI_V55241 else 5242 5242 VBOX_PATH_QT := $(lastword $(sort $(wildcard $(KBUILD_DEVTOOLS_TRG)/qt/v5*))) 5243 endif # VBOX_WITH_QTGUI_V55243 endif 5244 5244 ifeq ($(VBOX_PATH_QT),) 5245 5245 ifneq ($(wildcard /Library/Frameworks/QtCore.framework),) … … 5252 5252 ifndef VBOX_WITH_QTGUI_V5 5253 5253 VBOX_PATH_QT ?= $(lastword $(filter %-$(tolower $(VBOX_VCC_TOOL_STEM)),$(sort $(wildcard $(KBUILD_DEVTOOLS_TRG)/qt/v4*)))) 5254 else # VBOX_WITH_QTGUI_V55254 else 5255 5255 VBOX_PATH_QT ?= $(lastword $(filter %-$(tolower $(VBOX_VCC_TOOL_STEM)),$(sort $(wildcard $(KBUILD_DEVTOOLS_TRG)/qt/v5*)))) 5256 endif # VBOX_WITH_QTGUI_V55256 endif 5257 5257 else if1of ($(KBUILD_TARGET), linux solaris) 5258 5258 ifndef VBOX_WITH_QTGUI_V5 5259 5259 VBOX_PATH_QT ?= $(lastword $(sort $(wildcard $(KBUILD_DEVTOOLS_TRG)/qt/v4*))) 5260 else # VBOX_WITH_QTGUI_V55260 else 5261 5261 VBOX_PATH_QT ?= $(lastword $(sort $(wildcard $(KBUILD_DEVTOOLS_TRG)/qt/v5*))) 5262 endif # VBOX_WITH_QTGUI_V55262 endif 5263 5263 ifneq ($(VBOX_PATH_QT),) 5264 5264 VBOX_WITH_ORACLE_QT = 1 … … 5272 5272 ifndef VBOX_WITH_QTGUI_V5 5273 5273 VBOX_PATH_QT_LIB ?= /usr/lib/qt4 5274 else # VBOX_WITH_QTGUI_V55274 else 5275 5275 VBOX_PATH_QT_LIB ?= /usr/lib/qt5 5276 endif # VBOX_WITH_QTGUI_V55276 endif 5277 5277 endif 5278 5278 endif … … 5289 5289 ifeq ($(KBUILD_TARGET), darwin) 5290 5290 VBOX_QT_MOD = \ 5291 QtCore \ 5292 QtGui \ 5293 QtWidgets \ 5294 QtPrintSupport \ 5295 QtMacExtras \ 5291 QtCore QtGui QtWidgets QtPrintSupport QtMacExtras \ 5296 5292 $(if $(VBOX_GUI_USE_QGL),QtOpenGL,) 5297 5293 else if1of ($(KBUILD_TARGET), linux freebsd netbsd openbsd solaris win) 5298 5294 VBOX_QT_MOD += \ 5299 Qt5Core \ 5300 Qt5Gui \ 5301 Qt5Widgets \ 5302 Qt5PrintSupport \ 5295 Qt5Core Qt5Gui Qt5Widgets Qt5PrintSupport \ 5303 5296 $(if $(VBOX_GUI_USE_QGL),Qt5OpenGL,) 5304 5297 if1of ($(KBUILD_TARGET), linux freebsd netbsd openbsd solaris) 5305 5298 VBOX_QT_MOD += \ 5306 Qt5DBus \ 5307 Qt5XcbQpa \ 5308 Qt5X11Extras 5299 Qt5DBus Qt5XcbQpa Qt5X11Extras 5300 # legacy libraries required to be installed on EL5 5301 VBOX_QT_LEGACY_LIBS = libxcb.so.1 libX11.so.6 libX11-xcb.so.1 5302 VBOX_QT_PLUGINS = plugins/platforms/libqxcb.so 5309 5303 else ifeq ($(KBUILD_TARGET), win) 5310 5304 VBOX_QT_MOD += \ -
trunk/Makefile.kmk
r60100 r60117 236 236 qt5-bin_INST = $(INST_BIN) 237 237 ifdef VBOX_WITH_HARDENING 238 # The wildcards are necessary to install the libs instead of the symlinks 238 239 qt5-bin_SOURCES = \ 239 $(foreach qtmod,$(VBOX_QT_MOD_NAMES),$(wildcard $(VBOX_PATH_QT_LIB)/lib$(qtmod)$(SUFF_DLL).*.*.*)=>lib$(qtmod)$(SUFF_DLL).5) \ 240 $(VBOX_PATH_QT)/plugins/platforms/libqxcb$(SUFF_DLL)=>platforms/libqxcb$(SUFF_DLL) \ 241 $(wildcard $(VBOX_PATH_QT)/lib/legacy/libxcb$(SUFF_DLL).*.*.*)=>legacy/libxcb$(SUFF_DLL).1 \ 242 $(wildcard $(VBOX_PATH_QT)/lib/legacy/libX11$(SUFF_DLL).*.*.*)=>legacy/libX11$(SUFF_DLL).6 \ 243 $(wildcard $(VBOX_PATH_QT)/lib/legacy/libX11-xcb$(SUFF_DLL).*.*.*)=>legacy/libX11-xcb$(SUFF_DLL).1 240 $(foreach qtmod,$(VBOX_QT_MOD_NAMES),$(wildcard $(VBOX_PATH_QT_LIB)/lib$(qtmod).so.*.*.*)=>lib$(qtmod).so.5) \ 241 $(foreach lib,$(VBOX_QT_PLUGINS),$(VBOX_PATH_QT)/$(lib)=>$(lib)) \ 242 $(foreach lib,$(VBOX_QT_LEGACY_LIBS),$(wildcard $(VBOX_PATH_QT_LIB)/legacy/$(lib).*.*)=>legacy/$(lib)) 244 243 else # !VBOX_WITH_HARDENING 245 244 # For non-hardened builds we need to remove the RUNPATH. This stuff is … … 247 246 # (indirectly) change the binaries in tools 248 247 qt5-bin_SOURCES = \ 249 $(foreach qtmod,$(VBOX_QT_MOD_NAMES),$(qt5-bin_0_OUTDIR)/lib$(qtmod)$(SUFF_DLL).5.5.1=>lib$(qtmod)$(SUFF_DLL).5) \ 250 $(qt5-bin_0_OUTDIR)/libqxcb$(SUFF_DLL)=>platforms/libqxcb$(SUFF_DLL) \ 251 $(qt5-bin_0_OUTDIR)/libxcb$(SUFF_DLL).1=>legacy/libxcb$(SUFF_DLL).1 \ 252 $(qt5-bin_0_OUTDIR)/libX11$(SUFF_DLL).6=>legacy/libX11$(SUFF_DLL).6 \ 253 $(qt5-bin_0_OUTDIR)/libX11-xcb$(SUFF_DLL).1=>legacy/libX11-xcb$(SUFF_DLL).1 254 255 $(foreach qtmod,$(VBOX_QT_MOD_NAMES),$$(qt5-bin_0_OUTDIR)/lib$(qtmod)$(SUFF_DLL).5.5.1): \ 248 $(foreach qtmod,$(VBOX_QT_MOD_NAMES),$(qt5-bin_0_OUTDIR)/lib$(qtmod).so.5.5.1=>lib$(qtmod).so.5) \ 249 $(foreach lib,$(VBOX_QT_PLUGINS),$(qt5-bin_0_OUTDIR)/$(lib)=>$(lib)) \ 250 $(foreach lib,$(VBOX_QT_LEGACY_LIBS),$(qt5-bin_0_OUTDIR)/$(lib)=>legacy/$(lib)) 251 252 $(foreach qtmod,$(VBOX_QT_MOD_NAMES),$$(qt5-bin_0_OUTDIR)/lib$(qtmod).so.5.5.1): \ 256 253 $$(qt5-bin_0_OUTDIR)/% : $(VBOX_PATH_QT_LIB)/% | $$(qt5-bin_0_OUTDIR)/ 257 254 $(call MSG_INST_FILE,$^,$@) … … 259 256 $(QUIET)chrpath --delete $@ 260 257 261 $ $(qt5-bin_0_OUTDIR)/libqxcb$(SUFF_DLL): $(VBOX_PATH_QT)/plugins/platforms/libqxcb$(SUFF_DLL)\262 258 $(foreach lib,$(VBOX_QT_PLUGINS),$$(qt5-bin_0_OUTDIR)/$(lib)): \ 259 $$(qt5-bin_0_OUTDIR)/% : $(VBOX_PATH_QT)/% | $$(qt5-bin_0_OUTDIR)/ 263 260 $(call MSG_INST_FILE,$^,$@) 261 $(QUIET)$(MKDIR) -p $(@D) 264 262 $(QUIET)$(CP) $^ $@ 265 263 $(QUIET)chrpath --delete $@ 266 264 267 $$(qt5-bin_0_OUTDIR)/libxcb$(SUFF_DLL).1: $(VBOX_PATH_QT)/lib/legacy/libxcb$(SUFF_DLL).1 \ 268 | $$(qt5-bin_0_OUTDIR)/ 269 $(call MSG_INST_FILE,$^,$@) 270 $(QUIET)$(CP) $^ $@ 271 $(QUIET)chrpath --delete $@ 272 273 $$(qt5-bin_0_OUTDIR)/libX11$(SUFF_DLL).6: $(VBOX_PATH_QT)/lib/legacy/libX11$(SUFF_DLL).6 \ 274 | $$(qt5-bin_0_OUTDIR)/ 275 $(call MSG_INST_FILE,$^,$@) 276 $(QUIET)$(CP) $^ $@ 277 $(QUIET)chrpath --delete $@ 278 279 $$(qt5-bin_0_OUTDIR)/libX11-xcb$(SUFF_DLL).1: $(VBOX_PATH_QT)/lib/legacy/libX11-xcb$(SUFF_DLL).1 \ 280 | $$(qt5-bin_0_OUTDIR)/ 265 $(foreach lib,$(VBOX_QT_LEGACY_LIBS),$$(qt5-bin_0_OUTDIR)/$(lib)): \ 266 $$(qt5-bin_0_OUTDIR)/% : $(VBOX_PATH_QT_LIB)/legacy/% | $$(qt5-bin_0_OUTDIR)/ 281 267 $(call MSG_INST_FILE,$^,$@) 282 268 $(QUIET)$(CP) $^ $@ -
trunk/src/VBox/Installer/linux/Makefile.kmk
r60094 r60117 269 269 else # VBOX_WITH_QTGUI_V5 270 270 VBOX_LNX_NO_STRIP += \ 271 platforms/libqxcb.so \ 272 legacy/libxcb.so.1 \ 273 legacy/libX11.so.6 \ 274 legacy/libX11-xcb.so.1 271 $(VBOX_QT_PLUGINS) \ 272 $(addprefix legacy/,$(VBOX_QT_LEGACY_LIBS)) 275 273 endif # VBOX_WITH_QTGUI_V5 276 274 endif … … 520 518 archive/accessible),) \ 521 519 $(if $(VBOX_WITH_QTGUI_V5),\ 522 archive/pl atforms \520 archive/plugins/platforms \ 523 521 archive/legacy,) \ 524 522 $(if $(VBOX_WITH_PYTHON),\
Note:
See TracChangeset
for help on using the changeset viewer.