From 730db0768a4bb0a83c782fa0cc47532aa574165b Mon Sep 17 00:00:00 2001
From: mglae <mglmail@arcor.de>
Date: Tue, 16 Feb 2021 19:15:04 +0100
Subject: [PATCH 1/3] autoreconf: support custom PKG_CONFIGURE_SCRIPT

---
 scripts/autoreconf | 18 ++++++++++--------
 scripts/build      |  2 +-
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/scripts/autoreconf b/scripts/autoreconf
index 26cc2ca1bc..66413841e0 100755
--- a/scripts/autoreconf
+++ b/scripts/autoreconf
@@ -6,27 +6,29 @@
 
 . config/options "${1}"
 
-if [ ! -f "${PKG_BUILD}/configure.in" \
-    -a ! -f "${PKG_BUILD}/configure.ac" ]; then
+RECONF_DIR="${3}"
+
+if [ ! -f "${RECONF_DIR}/configure.in" \
+    -a ! -f "${RECONF_DIR}/configure.ac" ]; then
   die "configure.in or configure.ac not found"
 fi
 
-if [ ! -f "${PKG_BUILD}/.autoreconf-done" ]; then
+if [ ! -f "${RECONF_DIR}/.autoreconf-done" ]; then
   PARENT_PKG="${2}"
 
   # lock package during autoreconf otherwise it is racy, eg. glib:host/glib:target building concurrently
   pkg_lock "${PKG_NAME}" "reconf" "${PARENT_PKG}"
 
-  if [ ! -f "${PKG_BUILD}/.autoreconf-done" ]; then
+  if [ ! -f "${RECONF_DIR}/.autoreconf-done" ]; then
     pkg_lock_status "ACTIVE" "${PKG_NAME}" "reconf"
 
-    touch "${PKG_BUILD}/NEWS" "${PKG_BUILD}/AUTHORS" "${PKG_BUILD}/ChangeLog"
-    mkdir -p "${PKG_BUILD}/m4"
+    touch "${RECONF_DIR}/NEWS" "${RECONF_DIR}/AUTHORS" "${RECONF_DIR}/ChangeLog"
+    mkdir -p "${RECONF_DIR}/m4"
 
     build_msg "CLR_AUTORECONF" "AUTORECONF" "${PKG_NAME}" "indent"
 
-    do_autoreconf "${PKG_BUILD}"
-    touch "${PKG_BUILD}/.autoreconf-done"
+    do_autoreconf "${RECONF_DIR}"
+    touch "${RECONF_DIR}/.autoreconf-done"
 
     pkg_lock_status "UNLOCK" "${PKG_NAME}" "reconf" "configured"
   else
diff --git a/scripts/build b/scripts/build
index 074cd8544c..033bbdce6c 100755
--- a/scripts/build
+++ b/scripts/build
@@ -207,7 +207,7 @@ BOOTSTRAP_MESON_OPTS="${HOST_MESON_OPTS}"
 
 # make autoreconf
 if [ "${PKG_TOOLCHAIN}" = "autotools" ]; then
-  ${SCRIPTS}/autoreconf "${PKG_NAME}" "${PARENT_PKG}"
+  ${SCRIPTS}/autoreconf "${PKG_NAME}" "${PARENT_PKG}" $(dirname "${PKG_CONFIGURE_SCRIPT}")
 fi
 
 pkg_lock_status "ACTIVE" "${PKG_NAME}:${TARGET}" "build"

From fc93964c2e4c8d464eb65eda2bc42bf5d25191a1 Mon Sep 17 00:00:00 2001
From: mglae <mglmail@arcor.de>
Date: Mon, 22 Feb 2021 19:32:36 +0100
Subject: [PATCH 2/3] open-vm-tools: use PKG_CONFIGURE_SCRIPT / cleanup

---
 packages/sysutils/open-vm-tools/package.mk | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/packages/sysutils/open-vm-tools/package.mk b/packages/sysutils/open-vm-tools/package.mk
index e7408aa6f3..65649f9858 100644
--- a/packages/sysutils/open-vm-tools/package.mk
+++ b/packages/sysutils/open-vm-tools/package.mk
@@ -28,13 +28,11 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-docs \
                            --with-udev-rules-dir=/usr/lib/udev/rules.d/ \
                            --with-sysroot=${SYSROOT_PREFIX}"
 
+configure_package() {
+  PKG_CONFIGURE_SCRIPT="${PKG_BUILD}/open-vm-tools/configure"
+}
+
 post_unpack() {
-  mv ${PKG_BUILD}/${PKG_NAME}/* ${PKG_BUILD}/
-
-  sed -e 's|.*common-agent/etc/config/Makefile.*||' -i ${PKG_BUILD}/configure.ac
-
-  mkdir -p ${PKG_BUILD}/common-agent/etc/config
-
   # Hack to allow package to be bumped without linking against old libraries
   rm -f ${SYSROOT_PREFIX}/usr/lib/libvmtools*
 }

From 5fc595d5a370fc6bb7292e2b63ebe3ac522c19e8 Mon Sep 17 00:00:00 2001
From: mglae <mglmail@arcor.de>
Date: Mon, 22 Feb 2021 19:33:30 +0100
Subject: [PATCH 3/3] asio: use PKG_CONFIGURE_SCRIPT

---
 .../addons/addon-depends/snapcast-depends/asio/package.mk     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/addons/addon-depends/snapcast-depends/asio/package.mk b/packages/addons/addon-depends/snapcast-depends/asio/package.mk
index e479e79aa3..0aa43ac95c 100644
--- a/packages/addons/addon-depends/snapcast-depends/asio/package.mk
+++ b/packages/addons/addon-depends/snapcast-depends/asio/package.mk
@@ -15,6 +15,6 @@ PKG_BUILD_FLAGS="-sysroot"
 
 PKG_CONFIGURE_OPTS_TARGET="--without-boost --without-openssl"
 
-post_unpack() {
-  mv ${PKG_BUILD}/asio/* ${PKG_BUILD}
+configure_package() {
+  PKG_CONFIGURE_SCRIPT="${PKG_BUILD}/asio/configure"
 }