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>
This commit is contained in:
Rosen Penev 2020-12-15 17:17:14 -08:00 committed by Moritz Warning
parent 3dd7f27558
commit 4407369e70
2 changed files with 8 additions and 32 deletions

View File

@ -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_MAINTAINER:=Steven Barth <cyrus@openwrt.org>
PKG_LICENSE:=GPL-2.0
PKG_MIRROR_HASH:=f47904d8ac860b8b80cb9f99e094cd74e95464b5ed011a7adbfc3445dab598b3
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
PKG_MAINTAINER:=Steven Barth <cyrus@openwrt.org>
PKG_LICENSE:=GPL-2.0-only
PKG_LICENSE_FILES:=LICENSE
PKG_BUILD_PARALLEL:=1
include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/cmake.mk

View File

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