mirror of
https://github.com/novatiq/packages.git
synced 2026-04-29 23:18:42 +01:00
Merge pull request #11872 from jefferyto/python3-makefile-cleanup
python3: Makefile cleanup
This commit is contained in:
@@ -22,6 +22,7 @@ PKG_MAINTAINER:=Michael Heimpold <mhei@heimpold.de>
|
||||
|
||||
PKG_INSTALL:=1
|
||||
PKG_BUILD_PARALLEL:=1
|
||||
PYTHON3_PKG_BUILD:=0
|
||||
|
||||
include $(INCLUDE_DIR)/package.mk
|
||||
include ../../lang/python/python3-package.mk
|
||||
|
||||
+6
-10
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=libsearpc
|
||||
PKG_VERSION:=3.2.0
|
||||
PKG_RELEASE:=3
|
||||
PKG_RELEASE:=4
|
||||
|
||||
PKG_SOURCE_PROTO:=git
|
||||
PKG_SOURCE_URL:=https://github.com/haiwen/libsearpc.git
|
||||
@@ -25,6 +25,7 @@ PKG_FIXUP:=autoreconf
|
||||
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_SUBDIR)
|
||||
PKG_BUILD_PARALLEL:=1
|
||||
PKG_INSTALL:=1
|
||||
PYTHON3_PKG_BUILD:=0
|
||||
|
||||
include $(INCLUDE_DIR)/package.mk
|
||||
include $(INCLUDE_DIR)/nls.mk
|
||||
@@ -50,19 +51,21 @@ define Package/python3-searpc
|
||||
SUBMENU:=Python
|
||||
TITLE:=Python bindings for Searpc
|
||||
DEPENDS:=+libsearpc +python3-light +python3-logging
|
||||
VARIANT:=python3
|
||||
endef
|
||||
|
||||
define Package/python3-searpc/description
|
||||
$(call Package/libsearpc/description)
|
||||
|
||||
This package contains the Python bindings for Searpc.
|
||||
This package contains Python bindings for Searpc.
|
||||
endef
|
||||
|
||||
CONFIGURE_ARGS += \
|
||||
--disable-compile-demo \
|
||||
--disable-server-pkg
|
||||
|
||||
CONFIGURE_VARS += \
|
||||
PYTHON="$(HOST_PYTHON3_BIN)"
|
||||
|
||||
define Build/InstallDev
|
||||
$(INSTALL_DIR) $(1)/usr/{bin,include}
|
||||
$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
|
||||
@@ -77,13 +80,6 @@ define Package/libsearpc/install
|
||||
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libsearpc.so* $(1)/usr/lib/
|
||||
endef
|
||||
|
||||
define Py3Build/Compile
|
||||
rm -rf $(PKG_INSTALL_DIR)$(PYTHON3_PKG_DIR)/pysearpc
|
||||
$(INSTALL_DIR) $(PKG_INSTALL_DIR)$(PYTHON3_PKG_DIR)/pysearpc
|
||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/pysearpc/*.py $(PKG_INSTALL_DIR)$(PYTHON3_PKG_DIR)/pysearpc/
|
||||
rm -f $(PKG_INSTALL_DIR)$(PYTHON3_PKG_DIR)/pysearpc/{pygencode,test_pysearpc}.py
|
||||
endef
|
||||
|
||||
Py3Package/python3-searpc/install:=:
|
||||
|
||||
$(eval $(call BuildPackage,libsearpc))
|
||||
|
||||
@@ -0,0 +1,8 @@
|
||||
--- a/pysearpc/Makefile.am
|
||||
+++ b/pysearpc/Makefile.am
|
||||
@@ -1,4 +1,4 @@
|
||||
|
||||
pysearpcdir=${pyexecdir}/pysearpc
|
||||
|
||||
-pysearpc_PYTHON = __init__.py client.py common.py errors.py named_pipe.py server.py transport.py utils.py
|
||||
+pysearpc_DATA = __init__.py client.py common.py errors.py named_pipe.py server.py transport.py utils.py
|
||||
+2
-4
@@ -11,7 +11,7 @@ include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=newt
|
||||
PKG_VERSION:=0.52.21
|
||||
PKG_RELEASE:=3
|
||||
PKG_RELEASE:=4
|
||||
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
||||
PKG_SOURCE_URL:=https://releases.pagure.org/newt
|
||||
@@ -24,6 +24,7 @@ PKG_CPE_ID:=cpe:/a:fedorahosted:newt
|
||||
|
||||
PKG_BUILD_PARALLEL:=1
|
||||
PKG_INSTALL:=1
|
||||
PYTHON3_PKG_BUILD:=0
|
||||
|
||||
include $(INCLUDE_DIR)/package.mk
|
||||
include $(INCLUDE_DIR)/nls.mk
|
||||
@@ -73,7 +74,6 @@ $(call Package/newt/Default)
|
||||
SUBMENU:=Python
|
||||
TITLE+= module for Python
|
||||
DEPENDS:=+libnewt +python3-light
|
||||
VARIANT:=python3
|
||||
endef
|
||||
|
||||
define Package/python3-newt/description
|
||||
@@ -93,8 +93,6 @@ CONFIGURE_VARS += $(if $(CONFIG_BUILD_NLS),ac_cv_lib_c_gettext=no)
|
||||
|
||||
MAKE_VARS+= PYTHON_CONFIG_PATH="$(STAGING_DIR)/host/bin"
|
||||
|
||||
Build/Compile=$(call Build/Compile/Default,)
|
||||
|
||||
define Build/InstallDev
|
||||
$(INSTALL_DIR) $(1)/usr/include
|
||||
$(CP) $(PKG_INSTALL_DIR)/usr/include/newt.h $(1)/usr/include/
|
||||
|
||||
Reference in New Issue
Block a user