diff options
| author | Jeffery To <jeffery.to@gmail.com> | 2020-04-17 22:23:39 +0800 |
|---|---|---|
| committer | Jeffery To <jeffery.to@gmail.com> | 2020-04-19 01:56:23 +0800 |
| commit | 1bc2f4f3c6216ece87f0821d68e4e25f821dc382 (patch) | |
| tree | a78727b5f600f03c61807f42e13328d2847625a7 /net/nmap | |
| parent | 9636f6f4477c228e0b3c23f4082b53ab7c61f3ce (diff) | |
treewide: Remove Python variants for non-Python packages
This removes Python-related build variants, and adds
PYTHON3_PKG_BUILD:=0 and minor build adjustments (where appropriate),
for non-Python packages. There should be no changes to build output.
This also updates some include paths for python3-package.mk and/or
python3-host.mk to be relative to the package Makefile.
Signed-off-by: Jeffery To <jeffery.to@gmail.com>
Diffstat (limited to 'net/nmap')
| -rw-r--r-- | net/nmap/Makefile | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/net/nmap/Makefile b/net/nmap/Makefile index 46c047981..648ade267 100644 --- a/net/nmap/Makefile +++ b/net/nmap/Makefile @@ -14,7 +14,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=nmap PKG_VERSION:=7.80 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_MAINTAINER:=Nuno Goncalves <nunojpg@gmail.com> PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 @@ -26,6 +26,7 @@ PKG_CPE_ID:=cpe:/a:nmap:nmap PKG_BUILD_PARALLEL:=1 PKG_INSTALL:=1 +PYTHON3_PKG_BUILD:=0 include $(INCLUDE_DIR)/package.mk include ../../lang/python/python3-package.mk @@ -100,7 +101,6 @@ endef define Package/ndiff $(call Package/nmap/default) DEPENDS:=+python3-light +python3-xml - VARIANT:=python3 TITLE:=Utility to compare the results of Nmap scans endef @@ -148,10 +148,10 @@ CONFIGURE_VARS += \ PYTHON3_PKG_SETUP_DIR:=ndiff PYTHON3_PKG_SETUP_ARGS:= -ifeq ($(BUILD_VARIANT),python3) - Build/Configure:=: - Build/Install:=: -endif +define Build/Compile + $(call Build/Compile/Default,) + $(call Py3Build/Compile) +endef define Package/nmap/install $(INSTALL_DIR) $(1)/usr/bin |