Drop python3-crossver-package.mk

hzyitc · Jun 18, 2023 · 87775b6 · 87775b6
1 parent 839a44b
commit 87775b6
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 47 deletions.
diff --git a/keystone/Makefile b/keystone/Makefile
@@ -17,8 +17,7 @@ CMAKE_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
-# include $(TOPDIR)/feeds/packages/lang/python/python3-package.mk
-include ../python3-crossver-package.mk
+include $(TOPDIR)/feeds/packages/lang/python/python3-package.mk
 
 CMAKE_OPTIONS+= \
 	-DBUILD_LIBS_ONLY=ON \
@@ -69,6 +68,6 @@ endef
 
 $(eval $(call BuildPackage,keystone))
 
-$(eval $(call Py3CrossVerPackage,python3-keystone))
+$(eval $(call Py3Package,python3-keystone))
 $(eval $(call BuildPackage,python3-keystone))
-$(eval $(call BuildPackage,python3-keystone-src))
+$(eval $(call BuildPackage,python3-keystone-src))
diff --git a/python3-androidnativeemu/Makefile b/python3-androidnativeemu/Makefile
@@ -19,8 +19,7 @@ PKG_LICENSE_FILES:=LICENSE
 
 # include $(TOPDIR)/feeds/packages/lang/python/pypi.mk
 include $(INCLUDE_DIR)/package.mk
-# include $(TOPDIR)/feeds/packages/lang/python/python3-package.mk
-include ../python3-crossver-package.mk
+include $(TOPDIR)/feeds/packages/lang/python/python3-package.mk
 
 define Package/python3-androidnativeemu
   SECTION:=lang
@@ -41,6 +40,6 @@ define CheckDependencies
   true
 endef
 
-$(eval $(call Py3CrossVerPackage,python3-androidnativeemu))
+$(eval $(call Py3Package,python3-androidnativeemu))
 $(eval $(call BuildPackage,python3-androidnativeemu))
 $(eval $(call BuildPackage,python3-androidnativeemu-src))
diff --git a/python3-crossver-package.mk b/python3-crossver-package.mk
diff --git a/python3-hexdump/Makefile b/python3-hexdump/Makefile
@@ -17,8 +17,7 @@ PYTHON3_PKG_SETUP_ARGS:=
 
 include $(TOPDIR)/feeds/packages/lang/python/pypi.mk
 include $(INCLUDE_DIR)/package.mk
-# include $(TOPDIR)/feeds/packages/lang/python/python3-package.mk
-include ../python3-crossver-package.mk
+include $(TOPDIR)/feeds/packages/lang/python/python3-package.mk
 
 define Package/python3-hexdump
   SECTION:=lang
@@ -33,6 +32,6 @@ define Package/python3-pyelftools/description
   Dump binary data to hex format and restore from there.
 endef
 
-$(eval $(call Py3CrossVerPackage,python3-hexdump))
+$(eval $(call Py3Package,python3-hexdump))
 $(eval $(call BuildPackage,python3-hexdump))
 $(eval $(call BuildPackage,python3-hexdump-src))
diff --git a/python3-pyelftools/Makefile b/python3-pyelftools/Makefile
@@ -13,8 +13,7 @@ PKG_LICENSE_FILES:=LICENSE
 
 include $(TOPDIR)/feeds/packages/lang/python/pypi.mk
 include $(INCLUDE_DIR)/package.mk
-# include $(TOPDIR)/feeds/packages/lang/python/python3-package.mk
-include ../python3-crossver-package.mk
+include $(TOPDIR)/feeds/packages/lang/python/python3-package.mk
 
 define Package/python3-pyelftools
   SECTION:=lang
@@ -29,6 +28,6 @@ define Package/python3-pyelftools/description
   pyelftools is a pure-Python library for parsing and analyzing ELF files and DWARF debugging information. See the User's guide for more details.
 endef
 
-$(eval $(call Py3CrossVerPackage,python3-pyelftools))
+$(eval $(call Py3Package,python3-pyelftools))
 $(eval $(call BuildPackage,python3-pyelftools))
 $(eval $(call BuildPackage,python3-pyelftools-src))
diff --git a/unicorn/Makefile b/unicorn/Makefile
@@ -18,8 +18,7 @@ CMAKE_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
-# include $(TOPDIR)/feeds/packages/lang/python/python3-package.mk
-include ../python3-crossver-package.mk
+include $(TOPDIR)/feeds/packages/lang/python/python3-package.mk
 
 PYTHON3_PKG_SETUP_DIR:=bindings/python/
 PYTHON3_PKG_SETUP_VARS+= \
@@ -65,6 +64,6 @@ endef
 
 $(eval $(call BuildPackage,unicorn))
 
-$(eval $(call Py3CrossVerPackage,python3-unicorn))
+$(eval $(call Py3Package,python3-unicorn))
 $(eval $(call BuildPackage,python3-unicorn))
-$(eval $(call BuildPackage,python3-unicorn-src))
+$(eval $(call BuildPackage,python3-unicorn-src))