Changeset 79896 in vbox

Timestamp:

Jul 19, 2019 5:34:13 PM (6 years ago)

Author:

vboxsync

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

132304

Message:

/Makefile.kmk: Drop 32-bit builds from the extension pack. bugref:9511

File:

• trunk/Makefile.kmk (modified) (5 diffs)

trunk/Makefile.kmk

@@ -1402 +1402 @@
         + $(KMK) -C tools fetch VBOX_ONLY_EXTPACKS=1
         + $(KMK) -C tools fetch KBUILD_TARGET_ARCH=amd64 KBUILD_TARGET=darwin  BUILD_TARGET_ARCH=amd64 BUILD_TARGET=darwin   VBOX_ONLY_EXTPACKS=1
+#       + $(KMK) -C tools fetch KBUILD_TARGET_ARCH=amd64 KBUILD_TARGET=freebsd BUILD_TARGET_ARCH=amd64 BUILD_TARGET=freebsd  VBOX_ONLY_EXTPACKS=1
+        + $(KMK) -C tools fetch KBUILD_TARGET_ARCH=amd64 KBUILD_TARGET=linux   BUILD_TARGET_ARCH=amd64 BUILD_TARGET=linux    VBOX_ONLY_EXTPACKS=1
+        + $(KMK) -C tools fetch KBUILD_TARGET_ARCH=amd64 KBUILD_TARGET=solaris BUILD_TARGET_ARCH=amd64 BUILD_TARGET=solaris  VBOX_ONLY_EXTPACKS=1
+        + $(KMK) -C tools fetch KBUILD_TARGET_ARCH=amd64 KBUILD_TARGET=win     BUILD_TARGET_ARCH=amd64 BUILD_TARGET=win      VBOX_ONLY_EXTPACKS=1
+if1of (x86, $(VBOX_SUPPORTED_HOST_ARCHS))
         + $(KMK) -C tools fetch KBUILD_TARGET_ARCH=x86   KBUILD_TARGET=darwin  BUILD_TARGET_ARCH=x86   BUILD_TARGET=darwin   VBOX_ONLY_EXTPACKS=1
-#       + $(KMK) -C tools fetch KBUILD_TARGET_ARCH=amd64 KBUILD_TARGET=freebsd BUILD_TARGET_ARCH=amd64 BUILD_TARGET=freebsd  VBOX_ONLY_EXTPACKS=1
 #       + $(KMK) -C tools fetch KBUILD_TARGET_ARCH=x86   KBUILD_TARGET=freebsd BUILD_TARGET_ARCH=x86   BUILD_TARGET=freebsd  VBOX_ONLY_EXTPACKS=1
-        + $(KMK) -C tools fetch KBUILD_TARGET_ARCH=amd64 KBUILD_TARGET=linux   BUILD_TARGET_ARCH=amd64 BUILD_TARGET=linux    VBOX_ONLY_EXTPACKS=1
         + $(KMK) -C tools fetch KBUILD_TARGET_ARCH=x86   KBUILD_TARGET=linux   BUILD_TARGET_ARCH=x86   BUILD_TARGET=linux    VBOX_ONLY_EXTPACKS=1
 #       + $(KMK) -C tools fetch KBUILD_TARGET_ARCH=x86   KBUILD_TARGET=os2     BUILD_TARGET_ARCH=x86   BUILD_TARGET=os2      VBOX_ONLY_EXTPACKS=1
-        + $(KMK) -C tools fetch KBUILD_TARGET_ARCH=amd64 KBUILD_TARGET=solaris BUILD_TARGET_ARCH=amd64 BUILD_TARGET=solaris  VBOX_ONLY_EXTPACKS=1
-        + $(KMK) -C tools fetch KBUILD_TARGET_ARCH=amd64 KBUILD_TARGET=win     BUILD_TARGET_ARCH=amd64 BUILD_TARGET=win      VBOX_ONLY_EXTPACKS=1
         + $(KMK) -C tools fetch KBUILD_TARGET_ARCH=x86   KBUILD_TARGET=win     BUILD_TARGET_ARCH=x86   BUILD_TARGET=win      VBOX_ONLY_EXTPACKS=1
+endif
 
 
@@ -1455 +1457 @@
 
 extpacks-build-win.x86:
-ifeq ($(KBUILD_TARGET),win)
+if1of (x86, $(VBOX_SUPPORTED_HOST_ARCHS))
+ ifeq ($(KBUILD_TARGET),win)
         + $(TIME) -- $(KMK) $(VBOX_EXTPACKS_BUILD.x86) all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK)
-else
+ else
         $(call VBOX_BLD_VM_MSG_BEGIN,Windows/x86 extension packs)
         $(TIME) -- $(VBOX_SSH) vbox@$(VBOX_BLD_VM_WIN_X86_IP) 'cd e:/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh kmk $(VBOX_EXTPACKS_BUILD.x86) all '
         $(call VBOX_BLD_VM_MSG_END__,Windows/x86 extension packs)
+ endif
+else
+        @$(ECHO) "nothing to do for unsupported host $@"
 endif
 
@@ -1498 +1504 @@
 
 extpacks-build-linux.x86:   $(VBOX_EXTPACKS_BUILD_WIN_HOST_FIRST)
+ if1of (x86, $(VBOX_SUPPORTED_HOST_ARCHS))
         + $(TIME) -- $(KMK) $(VBOX_EXTPACKS_BUILD.x86) all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK)
+ else
+        @$(ECHO) "nothing to do for unsupported host $@"
+ endif
 
 extpacks-build-linux: extpacks-build-linux.x86 extpacks-build-linux.amd64
@@ -1510 +1520 @@
         $(TIME) -- $(VBOX_SSH) vbox@$(VBOX_BLD_VM_LNX_IP)         'dchroot -c debian-4.0-amd64 "cd /mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.amd64) all " '
         $(call VBOX_BLD_VM_MSG_END__,Linux/amd64 extension packs)
+ if1of (x86, $(VBOX_SUPPORTED_HOST_ARCHS))
         $(call VBOX_BLD_VM_MSG_BEGIN,Linux/x86 extension packs)
         $(TIME) -- $(VBOX_SSH) vbox@$(VBOX_BLD_VM_LNX_IP) 'linux32 dchroot -c debian-4.0-i386  "cd /mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.x86)   all " '
         $(call VBOX_BLD_VM_MSG_END__,Linux/x86 extension packs)
+ endif
 
 extpacks-build-linux.rsync-out-of-vm: extpacks-build-linux.build-it
+ if1of (x86, $(VBOX_SUPPORTED_HOST_ARCHS))
         $(TIME) -- $(VBOX_RSYNC) -a --delete $(VBOX_BLD_VM_LNX_IP):/mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)/out/linux.x86 out/
+ endif
         $(TIME) -- $(VBOX_RSYNC) -a --delete $(VBOX_BLD_VM_LNX_IP):/mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)/out/linux.amd64 out/
 
@@ -1554 +1568 @@
 
 extpacks-packing:
-        + $(KMK) VBOX_ONLY_EXTPACKS=1 \
-                VBOX_WITH_EXTPACK_OS_ARCHS="darwin.amd64 linux.amd64 linux.x86 solaris.amd64 win.amd64 win.x86" \
-                packing
-# +++ freebsd.amd64 freebsd.x86 os2.x86 ^^^
+if1of (x86, $(VBOX_SUPPORTED_HOST_ARCHS))
+        + $(KMK) VBOX_WITH_EXTPACK_OS_ARCHS="darwin.amd64 linux.amd64 linux.x86 solaris.amd64 win.amd64 win.x86" \
+                VBOX_ONLY_EXTPACKS=1 packing
+else
+        + $(KMK) VBOX_WITH_EXTPACK_OS_ARCHS="darwin.amd64 linux.amd64 solaris.amd64 win.amd64" \
+                VBOX_ONLY_EXTPACKS=1 packing
+endif
+# +++ freebsd.amd64 ^^^
 
 .PHONY: \