From: Jeffery To Date: Mon, 6 Mar 2023 14:09:53 +0000 (+0800) Subject: nmap: Force old Python build process X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=49880edcb3b744bcde4edf911e0fa4ed654d4b6b;p=feed%2Fpackages.git nmap: Force old Python build process This package isn't compatible with the new Python build process yet, so force the old build process for now. This also adds a call to Py3Build/Install, for when the new build process can be used. Signed-off-by: Jeffery To (cherry picked from commit da55275f3bbf3987771b97f7722d3023a0a8d7c4) --- diff --git a/net/nmap/Makefile b/net/nmap/Makefile index 7e097e13b6..b84b2ccd84 100644 --- a/net/nmap/Makefile +++ b/net/nmap/Makefile @@ -14,7 +14,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=nmap PKG_VERSION:=7.93 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_MAINTAINER:=Nuno Gonçalves PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 @@ -27,6 +27,7 @@ PKG_CPE_ID:=cpe:/a:nmap:nmap PKG_BUILD_PARALLEL:=1 PKG_INSTALL:=1 PYTHON3_PKG_BUILD:=0 +PYTHON3_PKG_FORCE_DISTUTILS_SETUP:=1 include $(INCLUDE_DIR)/package.mk include ../../lang/python/python3-package.mk @@ -150,6 +151,11 @@ define Build/Compile $(call Py3Build/Compile) endef +define Build/Install + $(call Build/Install/Default,) + $(call Py3Build/Install) +endef + define Package/nmap/install $(INSTALL_DIR) $(1)/usr/bin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/nmap $(1)/usr/bin/