From 1a45f225a0c6350eaa322a3303c18af6469b7cfd Mon Sep 17 00:00:00 2001
From: MilhouseVH <milhouseVH.github@nmacleod.com>
Date: Fri, 13 Dec 2019 22:15:18 +0000
Subject: [PATCH] p7zip: needs helping hand with cross-compiling

---
 packages/compress/p7zip/package.mk | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/packages/compress/p7zip/package.mk b/packages/compress/p7zip/package.mk
index 6c70056ead..18f30581f2 100644
--- a/packages/compress/p7zip/package.mk
+++ b/packages/compress/p7zip/package.mk
@@ -12,15 +12,27 @@ PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="p7zip is a port of 7za.exe for POSIX systems like Unix."
 PKG_TOOLCHAIN="manual"
 
-make_host() {
-  make CXX=$CXX CC=$CC 7za
+pre_build_host() {
+  rm -fr $PKG_BUILD/.$HOST_NAME
+  mkdir -p $PKG_BUILD/.$HOST_NAME
+  cp -RP $PKG_BUILD/* $PKG_BUILD/.$HOST_NAME
 }
 
-make_target() {
-  make CXX=$CXX CC=$CC 7z 7za
+make_host() {
+  make CXX=$CXX CC=$CC -C $PKG_BUILD/.$HOST_NAME 7za
 }
 
 makeinstall_host() {
   mkdir -p $TOOLCHAIN/bin
-    cp bin/7za $TOOLCHAIN/bin
+    cp $PKG_BUILD/.$HOST_NAME/bin/7za $TOOLCHAIN/bin
+}
+
+pre_build_target() {
+  rm -fr $PKG_BUILD/.$TARGET_NAME
+  mkdir -p $PKG_BUILD/.$TARGET_NAME
+  cp -RP $PKG_BUILD/* $PKG_BUILD/.$TARGET_NAME
+}
+
+make_target() {
+  make CXX=$CXX CC=$CC -C $PKG_BUILD/.$TARGET_NAME 7z 7za
 }