From c1a650c86281e67a552b77616933ff0656b6ea00 Mon Sep 17 00:00:00 2001
From: MilhouseVH <milhouseVH.github@nmacleod.com>
Date: Tue, 18 Dec 2018 03:43:28 +0000
Subject: [PATCH] packages: set
 [HOST|INIT|TARGET|BOOTSTRAP]_[CONFIGURE|CMAKE|MESON]_OPTS in
 pre_configure_$TARGET()

Because we set these variables unconditionally in scripts/build
---
 packages/sysutils/v86d/package.mk |  5 +++--
 packages/tools/qemu/package.mk    | 34 ++++++++++++++++---------------
 2 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/packages/sysutils/v86d/package.mk b/packages/sysutils/v86d/package.mk
index 43be0e2437..2a2355d494 100644
--- a/packages/sysutils/v86d/package.mk
+++ b/packages/sysutils/v86d/package.mk
@@ -1,5 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
+# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="v86d"
 PKG_VERSION="0.1.10"
@@ -11,9 +12,9 @@ PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS_INIT="toolchain gcc:init"
 PKG_LONGDESC="v86d is the userspace helper that runs x86 code in an emulated environment."
 
-INIT_CONFIGURE_OPTS="--with-x86emu"
-
 pre_configure_init() {
+  INIT_CONFIGURE_OPTS="--with-x86emu"
+
 # v86d fails to build in subdirs
   cd $PKG_BUILD
     rm -rf .$TARGET_NAME-init
diff --git a/packages/tools/qemu/package.mk b/packages/tools/qemu/package.mk
index a0258c8aba..6ee2649d5c 100644
--- a/packages/tools/qemu/package.mk
+++ b/packages/tools/qemu/package.mk
@@ -10,19 +10,21 @@ PKG_URL="https://download.qemu.org/qemu-$PKG_VERSION.tar.xz"
 PKG_DEPENDS_HOST="toolchain glib:host pixman:host Python2:host zlib:host"
 PKG_LONGDESC="QEMU is a generic and open source machine emulator and virtualizer."
 
-HOST_CONFIGURE_OPTS="--bindir=$TOOLCHAIN/bin \
-  --extra-cflags=-I$TOOLCHAIN/include \
-  --extra-ldflags=-L$TOOLCHAIN/lib \
-  --libexecdir=$TOOLCHAIN/lib \
-  --localstatedir=$TOOLCHAIN/var \
-  --prefix=$TOOLCHAIN \
-  --sbindir=$TOOLCHAIN/sbin \
-  --static \
-  --sysconfdir=$TOOLCHAIN/etc \
-  --disable-blobs \
-  --disable-docs \
-  --disable-gcrypt \
-  --disable-system \
-  --disable-user \
-  --disable-vnc \
-  --disable-werror"
+pre_configure_host() {
+  HOST_CONFIGURE_OPTS="--bindir=$TOOLCHAIN/bin \
+                       --extra-cflags=-I$TOOLCHAIN/include \
+                       --extra-ldflags=-L$TOOLCHAIN/lib \
+                       --libexecdir=$TOOLCHAIN/lib \
+                       --localstatedir=$TOOLCHAIN/var \
+                       --prefix=$TOOLCHAIN \
+                       --sbindir=$TOOLCHAIN/sbin \
+                       --static \
+                       --sysconfdir=$TOOLCHAIN/etc \
+                       --disable-blobs \
+                       --disable-docs \
+                       --disable-gcrypt \
+                       --disable-system \
+                       --disable-user \
+                       --disable-vnc \
+                       --disable-werror"
+}