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>
This commit is contained in:
Jeffery To
2020-04-17 22:23:39 +08:00
parent 9636f6f447
commit 1bc2f4f3c6
19 changed files with 33 additions and 48 deletions
+6 -6
View File
@@ -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