From 6b5ebac327d7a67c0bc59d28b2fe11a059e4a9ce Mon Sep 17 00:00:00 2001
From: cvh <namerp@googlemail.com>
Date: Fri, 18 Aug 2017 11:31:49 +0200
Subject: [PATCH 1/2] create_addon: use 7zip for addon.zip creation

---
 .../addon-depends/system-tools-depends/p7zip/package.mk  | 9 +++++++++
 packages/virtual/toolchain/package.mk                    | 2 +-
 scripts/create_addon                                     | 2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/packages/addons/addon-depends/system-tools-depends/p7zip/package.mk b/packages/addons/addon-depends/system-tools-depends/p7zip/package.mk
index a64020246f..c476f6eee9 100644
--- a/packages/addons/addon-depends/system-tools-depends/p7zip/package.mk
+++ b/packages/addons/addon-depends/system-tools-depends/p7zip/package.mk
@@ -30,10 +30,19 @@ PKG_SHORTDESC="p7zip is a port of 7za.exe for POSIX systems like Unix"
 PKG_LONGDESC="p7zip is a port of 7za.exe for POSIX systems like Unix"
 PKG_AUTORECONF="no"
 
+make_host() {
+  make TARGET_CXX=$CXX TARGET_CC=$CC 7za
+}
+
 make_target() {
   make TARGET_CXX=$CXX TARGET_CC=$CC 7z 7za
 }
 
+makeinstall_host() {
+  mkdir -p $TOOLCHAIN/bin
+    cp bin/7za $TOOLCHAIN/bin
+}
+
 makeinstall_target() {
   : # nop
 }
diff --git a/packages/virtual/toolchain/package.mk b/packages/virtual/toolchain/package.mk
index b2da8cd4cf..5b71694896 100644
--- a/packages/virtual/toolchain/package.mk
+++ b/packages/virtual/toolchain/package.mk
@@ -22,7 +22,7 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://libreelec.tv"
 PKG_URL=""
-PKG_DEPENDS_TARGET="configtools:host make:host xz:host sed:host pkg-config:host autoconf:host automake:host libtool:host intltool:host autoconf-archive:host gcc:host bison:host flex:host cmake:host xmlstarlet:host yasm:host"
+PKG_DEPENDS_TARGET="configtools:host make:host xz:host sed:host pkg-config:host autoconf:host automake:host libtool:host intltool:host autoconf-archive:host gcc:host bison:host flex:host cmake:host xmlstarlet:host yasm:host p7zip:host"
 PKG_SECTION="virtual"
 PKG_SHORTDESC="toolchain: LibreELEC.tv' toolchain"
 PKG_LONGDESC="a crosscompiling toolchain to compile all packages"
diff --git a/scripts/create_addon b/scripts/create_addon
index 5ec8b6b6d1..777ad76c7a 100755
--- a/scripts/create_addon
+++ b/scripts/create_addon
@@ -57,7 +57,7 @@ pack_addon() {
     fi
     cd $ADDON_BUILD
     echo "*** compressing Addon $PKG_ADDON_ID ... ***"
-    zip -rq $PKG_ADDON_ID-$ADDONVER.zip $PKG_ADDON_ID;
+    $TOOLCHAIN/bin/7za a -l -mx9 -bsp0 -bso0 -tzip $PKG_ADDON_ID-$ADDONVER.zip $PKG_ADDON_ID
     cd - &>/dev/null
 
     mkdir -p $ADDON_INSTALL_DIR

From 0aa2642d3ffbbab191092f8d77a1a03a6361a55a Mon Sep 17 00:00:00 2001
From: Peter Vicman <peter.vicman@gmail.com>
Date: Sun, 20 Aug 2017 21:57:19 +0200
Subject: [PATCH 2/2] p7zip: remove unneeded patch

---
 .../system-tools-depends/p7zip/package.mk          |  6 +++---
 .../p7zip/patches/p7zip-crosscompile.patch         | 14 --------------
 2 files changed, 3 insertions(+), 17 deletions(-)
 delete mode 100644 packages/addons/addon-depends/system-tools-depends/p7zip/patches/p7zip-crosscompile.patch

diff --git a/packages/addons/addon-depends/system-tools-depends/p7zip/package.mk b/packages/addons/addon-depends/system-tools-depends/p7zip/package.mk
index c476f6eee9..2ba78591a8 100644
--- a/packages/addons/addon-depends/system-tools-depends/p7zip/package.mk
+++ b/packages/addons/addon-depends/system-tools-depends/p7zip/package.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #      This file is part of LibreELEC - https://libreelec.tv
-#      Copyright (C) 2016 Team LibreELEC
+#      Copyright (C) 2016-present Team LibreELEC
 #
 #  LibreELEC is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -31,11 +31,11 @@ PKG_LONGDESC="p7zip is a port of 7za.exe for POSIX systems like Unix"
 PKG_AUTORECONF="no"
 
 make_host() {
-  make TARGET_CXX=$CXX TARGET_CC=$CC 7za
+  make CXX=$CXX CC=$CC 7za
 }
 
 make_target() {
-  make TARGET_CXX=$CXX TARGET_CC=$CC 7z 7za
+  make CXX=$CXX CC=$CC 7z 7za
 }
 
 makeinstall_host() {
diff --git a/packages/addons/addon-depends/system-tools-depends/p7zip/patches/p7zip-crosscompile.patch b/packages/addons/addon-depends/system-tools-depends/p7zip/patches/p7zip-crosscompile.patch
deleted file mode 100644
index 5e022073bd..0000000000
--- a/packages/addons/addon-depends/system-tools-depends/p7zip/patches/p7zip-crosscompile.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Naur p7zip_15.14/makefile.machine p7zip_15.14.patch/makefile.machine
---- p7zip_15.14/makefile.machine	2016-03-13 18:30:21.000000000 +0100
-+++ p7zip_15.14.patch/makefile.machine	2016-03-27 03:17:45.348285607 +0200
-@@ -10,8 +10,8 @@
- 	-D_7ZIP_LARGE_PAGES \
- 	$(LOCAL_FLAGS)
- 
--CXX=g++
--CC=gcc
-+CXX=$(TARGET_CXX)
-+CC=$(TARGET_CC)
- CC_SHARED=-fPIC
- LINK_SHARED=-fPIC -shared
-