Changeset 92590 in vbox

Timestamp:

Nov 24, 2021 10:32:04 PM (3 years ago)

Author:

vboxsync

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

148474

Message:

configure, debian/rules, rpm/rules: Fix AUTOCFG handing in configure, eliminating the need to pass it in the build command line. Also fix the out directory handling when it is overridden. In that case there is no additional out subdirectory.

Location:

trunk

Files:

• configure (modified) (2 diffs)
• debian/rules (modified) (2 diffs)
• src/VBox/Installer/linux/debian/rules (modified) (2 diffs)
• src/VBox/Installer/linux/rpm/rules (modified) (2 diffs)

trunk/configure

@@ -2726 +2726 @@
           # This variable has not *yet* been overridden.  That can still happen.
           ODIR=$OUT_BASE_PATH/
+          ODIR_OVERRIDE=1
         fi
       else
@@ -2808 +2809 @@
 # if we will be writing to a different out directory then set this up now
 if [ $ODIR_OVERRIDE -eq 1 ]; then
-  echo "AUTOCFG=$CFG" >> $ENV
+  echo "AUTOCFG=$ODIR" >> $ENV
   echo "export AUTOCFG" >> $ENV
 fi

trunk/debian/rules

@@ -53 +53 @@
 instlin  := $(vboxroot)/src/VBox/Installer/linux
 pkgdir   := $(if $(PKGDIR),$(PKGDIR),$(shell cd $(vboxroot)/..; pwd))
-outdir   := $(if $(PATH_OUT_BASE),$(PATH_OUT_BASE),$(vboxroot))/out
+outdir   := $(if $(PATH_OUT_BASE),$(PATH_OUT_BASE),$(vboxroot)/out)
 bldbase  := $(outdir)/debian
 builddir := $(bldbase)/builddir
@@ -111 +111 @@
     --disable-extpack
 
-bld_flags := AUTOCFG=$(bldbase)/AutoConfig.kmk \
-    LOCALCFG=$(debroot)/debian/LocalConfig.kmk \
+bld_flags := LOCALCFG=$(debroot)/debian/LocalConfig.kmk \
     PATH_OUT=$(builddir) \
     VBOX_WITHOUT_EXTPACK_PUEL_PACKING=1 \

trunk/src/VBox/Installer/linux/debian/rules

@@ -59 +59 @@
 instlin  := $(vboxroot)/src/VBox/Installer/linux
 pkgdir   := $(if $(PKGDIR),$(PKGDIR),$(shell cd $(vboxroot)/..; pwd))
-outdir   := $(if $(PATH_OUT_BASE),$(PATH_OUT_BASE),$(vboxroot))/out
+outdir   := $(if $(PATH_OUT_BASE),$(PATH_OUT_BASE),$(vboxroot)/out)
 bldbase  := $(outdir)/debian
 builddir := $(bldbase)/builddir
@@ -134 +134 @@
     --disable-extpack
 
-bld_flags := AUTOCFG=$(bldbase)/AutoConfig.kmk \
-    LOCALCFG=$(debroot)/debian/LocalConfig.kmk \
+bld_flags := LOCALCFG=$(debroot)/debian/LocalConfig.kmk \
     PATH_OUT=$(builddir) \
     VBOX_WITHOUT_EXTPACK_PUEL_PACKING=1 \

trunk/src/VBox/Installer/linux/rpm/rules

@@ -50 +50 @@
 instlin  := $(vboxroot)/src/VBox/Installer/linux
 pkgdir   := $(if $(PKGDIR),$(PKGDIR),$(shell cd $(vboxroot)/..; pwd))
-outdir   := $(if $(PATH_OUT_BASE),$(PATH_OUT_BASE),$(vboxroot))/out
+outdir   := $(if $(PATH_OUT_BASE),$(PATH_OUT_BASE),$(vboxroot)/out)
 bldbase  := $(outdir)/rpm
 builddir := $(bldbase)/builddir
@@ -175 +175 @@
     --disable-extpack
 
-bld_flags := AUTOCFG=$(bldbase)/AutoConfig.kmk \
-    LOCALCFG=$(instlin)/rpm/LocalConfig.kmk \
+bld_flags := LOCALCFG=$(instlin)/rpm/LocalConfig.kmk \
     PATH_OUT=$(builddir) \
     VBOX_WITHOUT_EXTPACK_PUEL_PACKING=1 \