Merge pull request #1821 from CvH/9.0-create_addon-7z

use 7zip for addon.zip creation

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
@@ -30,8 +30,17 @@ 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 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() {
+  mkdir -p $TOOLCHAIN/bin
+    cp bin/7za $TOOLCHAIN/bin
 }
 
 makeinstall_target() {

packages/addons/addon-depends/system-tools-depends/p7zip/patches/p7zip-crosscompile.patch

@@ -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
- 

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"

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