diff options
| author | Rosen Penev <rosenp@gmail.com> | 2020-12-16 04:17:14 +0300 |
|---|---|---|
| committer | Moritz Warning <moritzwarning@web.de> | 2020-12-17 09:29:46 +0300 |
| commit | 4407369e70a426f294573159e3d53aaf1d4449e8 (patch) | |
| tree | abdefb743f9ac7d85e34223bb2662d670d714d86 /ohybridproxy | |
| parent | 3dd7f27558fa1d6f0a11b997a6bbde5614bdbe96 (diff) | |
ohybridproxy: fix up Makefile
Use a more standard setup for local tarballs to clean up the Makefile.
Fixed license information.
Added PKG_BUILD_PARALLEL for faster compilation.
Removed upstreamed patch.
Signed-off-by: Rosen Penev <rosenp@gmail.com>
Diffstat (limited to 'ohybridproxy')
| -rw-r--r-- | ohybridproxy/Makefile | 12 | ||||
| -rw-r--r-- | ohybridproxy/patches/0001-find-libubox.patch | 26 |
2 files changed, 7 insertions, 31 deletions
diff --git a/ohybridproxy/Makefile b/ohybridproxy/Makefile index cefdf45..1932f6d 100644 --- a/ohybridproxy/Makefile +++ b/ohybridproxy/Makefile @@ -8,16 +8,18 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ohybridproxy PKG_SOURCE_VERSION:=0dfef1eb5f067250a5f24a899536879ea4fdc4c5 -PKG_VERSION:=2020-05-22-$(PKG_SOURCE_VERSION) -PKG_RELEASE:=1 +PKG_SOURCE_DATE:=2020-05-22 +PKG_RELEASE:=2 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/sbyx/ohybridproxy.git +PKG_MIRROR_HASH:=f47904d8ac860b8b80cb9f99e094cd74e95464b5ed011a7adbfc3445dab598b3 + PKG_MAINTAINER:=Steven Barth <cyrus@openwrt.org> -PKG_LICENSE:=GPL-2.0 +PKG_LICENSE:=GPL-2.0-only +PKG_LICENSE_FILES:=LICENSE -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) +PKG_BUILD_PARALLEL:=1 include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/cmake.mk diff --git a/ohybridproxy/patches/0001-find-libubox.patch b/ohybridproxy/patches/0001-find-libubox.patch deleted file mode 100644 index e29db5c..0000000 --- a/ohybridproxy/patches/0001-find-libubox.patch +++ /dev/null @@ -1,26 +0,0 @@ -From c015e7e62ed4c7645595f7f83cf156810433d0cd Mon Sep 17 00:00:00 2001 -From: Florian Fainelli <f.fainelli@gmail.com> -Date: Mon, 5 Jun 2017 17:56:33 -0700 -Subject: [PATCH] Cmake: Search and find libubox/utils.h - ---- - CMakeLists.txt | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 2556669d2a52..1c970d92ff56 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -16,6 +16,9 @@ else(${APPLE}) - set(dns_sd "dns_sd") - endif(${APPLE}) - -+FIND_PATH(ubox_include_dir libubox/utils.h) -+INCLUDE_DIRECTORIES(${ubox_include_dir}) -+ - set(CORE src/cache.c src/io.c src/socket.c) - - add_executable(ohybridproxy src/ohybridproxy.c src/dns2mdns.c ${CORE}) --- -2.9.3 - |