From 0aa2642d3ffbbab191092f8d77a1a03a6361a55a Mon Sep 17 00:00:00 2001 From: Peter Vicman Date: Sun, 20 Aug 2017 21:57:19 +0200 Subject: [PATCH] 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 -