From 07afe9505ff4b162944ff34eeaadc6dfc6a2e04d Mon Sep 17 00:00:00 2001 From: Shuanglei Tao Date: Wed, 25 Dec 2019 09:11:18 +0800 Subject: [PATCH] pdnsd-alt: fix building on macOS Signed-off-by: CN_SZTL --- package/lean/UnblockNeteaseMusic/Makefile | 108 +++++++++++----------- package/lean/pdnsd-alt/Makefile | 3 +- package/lean/tcpping/Makefile | 88 +++++++++--------- 3 files changed, 100 insertions(+), 99 deletions(-) diff --git a/package/lean/UnblockNeteaseMusic/Makefile b/package/lean/UnblockNeteaseMusic/Makefile index 935b4fdabc..3e90736339 100644 --- a/package/lean/UnblockNeteaseMusic/Makefile +++ b/package/lean/UnblockNeteaseMusic/Makefile @@ -1,54 +1,54 @@ -# -# Copyright (C) 2021 CTCGFW Project-OpenWrt -# -# -# This is free software, licensed under the GNU General Public License v3. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=UnblockNeteaseMusic -PKG_VERSION:=0.25.3 -PKG_RELEASE:=6 - -PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL:=https://github.com/nondanee/UnblockNeteaseMusic.git -PKG_SOURCE_DATE:2020-12-22 -PKG_SOURCE_VERSION:=b8d5f4b4fe59cef9c021b99f3cf2606d99fa4790 -PKG_MIRROR_HASH:=bd7fa102415ae8dbcd22829fce5ad0cd358a0869547c30f10271389e6c698317 - -PKG_LICENSE:=MIT -PKG_LICENSE_FILE:=LICENSE - -include $(INCLUDE_DIR)/package.mk - -define Package/UnblockNeteaseMusic - SECTION:=multimedia - CATEGORY:=Multimedia - TITLE:=Revive Netease Cloud Music (NodeJS) - URL:=https://github.com/nondanee/UnblockNeteaseMusic - DEPENDS:=+node +libopenssl - PKGARCH:=all -endef - -define Build/Prepare - mkdir -p $(PKG_BUILD_DIR) - xzcat $(DL_DIR)/$(PKG_SOURCE) | $(TAR) -C $(PKG_BUILD_DIR) $(TAR_OPTIONS) -endef - -define Build/Configure - echo -e $(PKG_VERSION) > $(PKG_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)/core_ver - echo -e $(PKG_SOURCE_VERSION) > $(PKG_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)/local_ver -endef - -define Build/Compile - true -endef - -define Package/UnblockNeteaseMusic/install - $(INSTALL_DIR) $(1)/usr/share/UnblockNeteaseMusic - $(CP) $(PKG_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)/* $(1)/usr/share/UnblockNeteaseMusic -endef - -$(eval $(call BuildPackage,UnblockNeteaseMusic)) +# +# Copyright (C) 2021 CTCGFW Project-OpenWrt +# +# +# This is free software, licensed under the GNU General Public License v3. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=UnblockNeteaseMusic +PKG_VERSION:=0.25.3 +PKG_RELEASE:=6 + +PKG_SOURCE_PROTO:=git +PKG_SOURCE_URL:=https://github.com/nondanee/UnblockNeteaseMusic.git +PKG_SOURCE_DATE:2020-12-22 +PKG_SOURCE_VERSION:=b8d5f4b4fe59cef9c021b99f3cf2606d99fa4790 +PKG_MIRROR_HASH:=bd7fa102415ae8dbcd22829fce5ad0cd358a0869547c30f10271389e6c698317 + +PKG_LICENSE:=MIT +PKG_LICENSE_FILE:=LICENSE + +include $(INCLUDE_DIR)/package.mk + +define Package/UnblockNeteaseMusic + SECTION:=multimedia + CATEGORY:=Multimedia + TITLE:=Revive Netease Cloud Music (NodeJS) + URL:=https://github.com/nondanee/UnblockNeteaseMusic + DEPENDS:=+node +libopenssl + PKGARCH:=all +endef + +define Build/Prepare + mkdir -p $(PKG_BUILD_DIR) + xzcat $(DL_DIR)/$(PKG_SOURCE) | $(TAR) -C $(PKG_BUILD_DIR) $(TAR_OPTIONS) +endef + +define Build/Configure + echo -e $(PKG_VERSION) > $(PKG_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)/core_ver + echo -e $(PKG_SOURCE_VERSION) > $(PKG_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)/local_ver +endef + +define Build/Compile + true +endef + +define Package/UnblockNeteaseMusic/install + $(INSTALL_DIR) $(1)/usr/share/UnblockNeteaseMusic + $(CP) $(PKG_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)/* $(1)/usr/share/UnblockNeteaseMusic +endef + +$(eval $(call BuildPackage,UnblockNeteaseMusic)) diff --git a/package/lean/pdnsd-alt/Makefile b/package/lean/pdnsd-alt/Makefile index 3b6196fd17..9d36521274 100644 --- a/package/lean/pdnsd-alt/Makefile +++ b/package/lean/pdnsd-alt/Makefile @@ -43,7 +43,8 @@ endef TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include CONFIGURE_ARGS += \ - --with-cachedir=/var/pdnsd + --with-cachedir=/var/pdnsd \ + --with-target=Linux define Package/pdnsd-alt/install $(INSTALL_DIR) $(1)/usr/sbin diff --git a/package/lean/tcpping/Makefile b/package/lean/tcpping/Makefile index 5c1fe9a303..c7c65de5e1 100644 --- a/package/lean/tcpping/Makefile +++ b/package/lean/tcpping/Makefile @@ -1,44 +1,44 @@ -# -# Copyright (C) 2021 CTCGFW Project-OpenWrt -# -# -# This is free software, licensed under the GNU General Public License v3. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=tcpping -PKG_VERSION:=0.2 -PKG_RELEASE=2 - -PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL:=https://github.com/coolsnowwolf/tcping -PKG_SOURCE_DATE:=2020-09-19 -PKG_SOURCE_VERSION:=d890cc1bd8e3951390ceeff1ccb092a5d802850c -PKG_MIRROR_HASH:=018554a80e8a9d8fedd39821f35aa02c7c763fd42213761fba9b21c2533e1ab8 - -PKG_BUILD_PARALLEL:=1 - -include $(INCLUDE_DIR)/package.mk - -define Package/tcpping - SECTION:=net - CATEGORY:=Network - DEPENDS:=+libnet-1.2.x +libpcap - TITLE:=Ping look-alike that uses TCP SYN packets to get around firewalls and ICMP blackholes -endef - -define Build/Compile - +$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \ - $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/lib/libnet-1.2.x/include -L$(STAGING_DIR)/usr/lib/libnet-1.2.x/lib" \ - INSTALL_PROG=":" -endef - -define Package/tcpping/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/tcpping $(1)/usr/bin/tcpping -endef - -$(eval $(call BuildPackage,tcpping)) +# +# Copyright (C) 2021 CTCGFW Project-OpenWrt +# +# +# This is free software, licensed under the GNU General Public License v3. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=tcpping +PKG_VERSION:=0.2 +PKG_RELEASE=2 + +PKG_SOURCE_PROTO:=git +PKG_SOURCE_URL:=https://github.com/coolsnowwolf/tcping +PKG_SOURCE_DATE:=2020-09-19 +PKG_SOURCE_VERSION:=d890cc1bd8e3951390ceeff1ccb092a5d802850c +PKG_MIRROR_HASH:=018554a80e8a9d8fedd39821f35aa02c7c763fd42213761fba9b21c2533e1ab8 + +PKG_BUILD_PARALLEL:=1 + +include $(INCLUDE_DIR)/package.mk + +define Package/tcpping + SECTION:=net + CATEGORY:=Network + DEPENDS:=+libnet-1.2.x +libpcap + TITLE:=Ping look-alike that uses TCP SYN packets to get around firewalls and ICMP blackholes +endef + +define Build/Compile + +$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \ + $(TARGET_CONFIGURE_OPTS) \ + CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/lib/libnet-1.2.x/include -L$(STAGING_DIR)/usr/lib/libnet-1.2.x/lib" \ + INSTALL_PROG=":" +endef + +define Package/tcpping/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/tcpping $(1)/usr/bin/tcpping +endef + +$(eval $(call BuildPackage,tcpping))