Changeset 38082 in vbox for trunk/src/VBox/Runtime

Timestamp:

Jul 20, 2011 2:26:24 PM (14 years ago)

Author:

vboxsync

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

73029

Message:

*.kmk: Installation/staging adjustments (kBuild 0.2.0 preps).

Location:

trunk/src/VBox/Runtime

Files:

• Makefile.kmk (modified) (4 diffs)
• testcase/Makefile.kmk (modified) (11 diffs)

trunk/src/VBox/Runtime/Makefile.kmk

@@ -1262 +1262 @@
 VBoxRT_INCS.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH) = $(RuntimeR3_INCS.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH))
 VBoxRT_LIBS                    = \
-        $(PATH_LIB)/VBox-liblzf$(VBOX_SUFF_LIB) \
+        $(PATH_STAGE_LIB)/VBox-liblzf$(VBOX_SUFF_LIB) \
         $(SDK_VBOX_ZLIB_LIBS)
 if1of ($(KBUILD_TARGET_ARCH), amd64 x86)
 VBoxRT_LIBS                   += \
-        $(PATH_LIB)/SUPR3$(VBOX_SUFF_LIB)
+        $(PATH_STAGE_LIB)/SUPR3$(VBOX_SUFF_LIB)
 endif
 ifdef IPRT_WITH_KSTUFF
  VBoxRT_LIBS                  += \
-        $(PATH_LIB)/VBox-kStuff$(VBOX_SUFF_LIB)
+        $(PATH_STAGE_LIB)/VBox-kStuff$(VBOX_SUFF_LIB)
 endif
 ifndef SDK_VBOX_LIBXML2_LIBS
  VBoxRT_LIBS                 += \
-        $(PATH_LIB)/VBox-libxml2$(VBOX_SUFF_LIB)
+        $(PATH_STAGE_LIB)/VBox-libxml2$(VBOX_SUFF_LIB)
 endif
 ifndef SDK_VBOX_OPENSSL_LIBS
  VBoxRT_LIBS                 += \
-        $(PATH_LIB)/VBox-libcrypto$(VBOX_SUFF_LIB) \
-        $(PATH_LIB)/VBox-libssl$(VBOX_SUFF_LIB)
+        $(PATH_STAGE_LIB)/VBox-libcrypto$(VBOX_SUFF_LIB) \
+        $(PATH_STAGE_LIB)/VBox-libssl$(VBOX_SUFF_LIB)
 endif
 ifdef IPRT_WITH_LZO
@@ -1307 +1307 @@
 VBoxRT_LDFLAGS.l4              = \
         -Wl,-whole-archive \
-        $(PATH_LIB)/RuntimeR3L4$(VBOX_SUFF_LIB) \
+        $(PATH_STAGE_LIB)/RuntimeR3L4$(VBOX_SUFF_LIB) \
         -Wl,-no-whole-archive
 ifeq ($(KBUILD_TARGET),l4)
@@ -1315 +1315 @@
 endif
 VBoxRT_LIBS.l4                 = \
-        $(PATH_LIB)/RuntimeR3L4$(VBOX_SUFF_LIB)
+        $(PATH_STAGE_LIB)/RuntimeR3L4$(VBOX_SUFF_LIB)
 
 if1of ($(DLLS), VBoxRT)
@@ -1339 +1339 @@
 VBoxRTDummy_TEMPLATE = VBOXR3
 VBoxRTDummy_NOINST = true
-VBoxRTDummy_LIBS = $(PATH_BIN)/VBoxRT.so
-VBoxRTDummy_CLEAN= $(PATH_BIN)/VBoxRT.so
-BLDDIRS += $(PATH_BIN)
-
-$(PATH_BIN)/VBoxRT.so: $$(VBoxRT_1_TARGET) | $$(dir $$@)
+VBoxRTDummy_LIBS = $(PATH_STAGE_BIN)/VBoxRT.so
+VBoxRTDummy_CLEAN= $(PATH_STAGE_BIN)/VBoxRT.so
+BLDDIRS += $(PATH_STAGE_BIN)
+
+$(PATH_STAGE_BIN)/VBoxRT.so: $$(VBoxRT_1_TARGET) | $$(dir $$@)
         $(INSTALL) $< $@
         chcon -t texrel_shlib_t $@ || true

trunk/src/VBox/Runtime/testcase/Makefile.kmk

@@ -279 +279 @@
 tstLdr-2_DEFS = IN_DIS
 tstLdr-2_LIBS = \
-        $(PATH_LIB)/DisasmR3$(VBOX_SUFF_LIB)
+        $(PATH_STAGE_LIB)/DisasmR3$(VBOX_SUFF_LIB)
 
 ifdef VBOX_WITH_RAW_MODE
@@ -291 +291 @@
  endif
  tstLdrObj_LIBS = \
-        $(PATH_LIB)/DisasmRC$(VBOX_SUFF_LIB) \
-        $(PATH_LIB)/RuntimeRC$(VBOX_SUFF_LIB)
+        $(PATH_STAGE_LIB)/DisasmRC$(VBOX_SUFF_LIB) \
+        $(PATH_STAGE_LIB)/RuntimeRC$(VBOX_SUFF_LIB)
  ifeq ($(VBOX_LDR_FMT32),pe)
  tstLdrObj_LIBS += \
-        $(PATH_LIB)/VMMRCBuiltin$(VBOX_SUFF_LIB)
+        $(PATH_STAGE_LIB)/VMMRCBuiltin$(VBOX_SUFF_LIB)
  endif # PE
  ifeq ($(VBOX_LDR_FMT32),elf)
@@ -302 +302 @@
  ifeq ($(VBOX_LDR_FMT32),lx)
  tstLdrObj_LIBS += \
-        $(PATH_LIB)/VMMRCBuiltin$(VBOX_SUFF_LIB)
+        $(PATH_STAGE_LIB)/VMMRCBuiltin$(VBOX_SUFF_LIB)
  endif
 endif # VBOX_WITH_RAW_MODE
@@ -309 +309 @@
 tstLdr-3_DEFS = IN_DIS
 tstLdr-3_LIBS = \
-        $(PATH_LIB)/DisasmR3$(VBOX_SUFF_LIB)
+        $(PATH_STAGE_LIB)/DisasmR3$(VBOX_SUFF_LIB)
 
 tstLdr-4Imp_TEMPLATE = VBoxR0
@@ -330 +330 @@
 endif
 tstLdrObjR0_LIBS = \
-        $(PATH_LIB)/DisasmR0$(VBOX_SUFF_LIB) \
-        $(PATH_LIB)/RuntimeR0$(VBOX_SUFF_LIB)
+        $(PATH_STAGE_LIB)/DisasmR0$(VBOX_SUFF_LIB) \
+        $(PATH_STAGE_LIB)/RuntimeR0$(VBOX_SUFF_LIB)
 ifeq ($(VBOX_LDR_FMT),pe)
  tstLdrObjR0_LIBS += \
-        $(PATH_LIB)/SUPR0$(VBOX_SUFF_LIB) \
+        $(PATH_STAGE_LIB)/SUPR0$(VBOX_SUFF_LIB) \
         $(TARGET_tstLdr-4Imp)
 endif
@@ -342 +342 @@
 ifeq ($(VBOX_LDR_FMT),lx)
  tstLdrObjR0_LIBS += \
-        $(PATH_LIB)/SUPR0$(VBOX_SUFF_LIB) \
+        $(PATH_STAGE_LIB)/SUPR0$(VBOX_SUFF_LIB) \
         $(TARGET_tstLdr-4Imp)
 endif
@@ -349 +349 @@
 tstLdr-4_DEFS = IN_DIS
 tstLdr-4_LIBS = \
-        $(PATH_LIB)/DisasmR3$(VBOX_SUFF_LIB)
+        $(PATH_STAGE_LIB)/DisasmR3$(VBOX_SUFF_LIB)
 
 tstLdrLoad_SOURCES = tstLdrLoad.cpp
@@ -528 +528 @@
 tstRTR0MemUserKernel_SYSSUFF = .r0
 tstRTR0MemUserKernel_SOURCES = tstRTR0MemUserKernel.cpp
-tstRTR0MemUserKernel_LIBS = $(PATH_LIB)/RuntimeR0$(VBOX_SUFF_LIB)
+tstRTR0MemUserKernel_LIBS = $(PATH_STAGE_LIB)/RuntimeR0$(VBOX_SUFF_LIB)
 if1of ($(VBOX_LDR_FMT), pe lx)
- tstRTR0MemUserKernel_LIBS += $(PATH_LIB)/SUPR0$(VBOX_SUFF_LIB)
+ tstRTR0MemUserKernel_LIBS += $(PATH_STAGE_LIB)/SUPR0$(VBOX_SUFF_LIB)
 endif
 tstRTR0MemUserKernelDriver_TEMPLATE = VBOXR3TSTEXE
@@ -541 +541 @@
 tstRTR0SemMutex_SYSSUFF = .r0
 tstRTR0SemMutex_SOURCES = tstRTR0SemMutex.cpp
-tstRTR0SemMutex_LIBS = $(PATH_LIB)/RuntimeR0$(VBOX_SUFF_LIB)
+tstRTR0SemMutex_LIBS = $(PATH_STAGE_LIB)/RuntimeR0$(VBOX_SUFF_LIB)
 if1of ($(VBOX_LDR_FMT), pe lx)
- tstRTR0SemMutex_LIBS += $(PATH_LIB)/SUPR0$(VBOX_SUFF_LIB)
+ tstRTR0SemMutex_LIBS += $(PATH_STAGE_LIB)/SUPR0$(VBOX_SUFF_LIB)
 endif
 tstRTR0SemMutexDriver_TEMPLATE = VBOXR3TSTEXE
@@ -554 +554 @@
 tstRTR0Timer_SYSSUFF = .r0
 tstRTR0Timer_SOURCES = tstRTR0Timer.cpp
-tstRTR0Timer_LIBS = $(PATH_LIB)/RuntimeR0$(VBOX_SUFF_LIB)
+tstRTR0Timer_LIBS = $(PATH_STAGE_LIB)/RuntimeR0$(VBOX_SUFF_LIB)
 if1of ($(VBOX_LDR_FMT), pe lx)
- tstRTR0Timer_LIBS += $(PATH_LIB)/SUPR0$(VBOX_SUFF_LIB)
+ tstRTR0Timer_LIBS += $(PATH_STAGE_LIB)/SUPR0$(VBOX_SUFF_LIB)
 endif
 tstRTR0TimerDriver_TEMPLATE = VBOXR3TSTEXE
@@ -567 +567 @@
 tstR0ThreadPreemption_SYSSUFF = .r0
 tstR0ThreadPreemption_SOURCES = tstR0ThreadPreemption.cpp
-tstR0ThreadPreemption_LIBS = $(PATH_LIB)/RuntimeR0$(VBOX_SUFF_LIB)
+tstR0ThreadPreemption_LIBS = $(PATH_STAGE_LIB)/RuntimeR0$(VBOX_SUFF_LIB)
 if1of ($(VBOX_LDR_FMT), pe lx)
- tstR0ThreadPreemption_LIBS += $(PATH_LIB)/SUPR0$(VBOX_SUFF_LIB)
+ tstR0ThreadPreemption_LIBS += $(PATH_STAGE_LIB)/SUPR0$(VBOX_SUFF_LIB)
 endif
 tstR0ThreadPreemptionDriver_TEMPLATE = VBOXR3TSTEXE