mirror
/
openwrt-packages
mirror of https://git.openwrt.org/feed/packages.git
1
0
Fork 0
Code Releases Activity

Merge pull request #20664 from mhei/fix-gensio-build-20604 

gensio: fix python bindings build by using a pcre enabled host swig (fixes #20604)
This commit is contained in:
Michael Heimpold 2023-03-22 07:59:07 +01:00 committed by GitHub
parent ab573bdb4d 31a18de442
commit 11756e0622
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libs/pcre2/Makefile
View File

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=pcre2 PKG_NAME:=pcre2
PKG_VERSION:=10.37 PKG_VERSION:=10.37
PKG_RELEASE:=$(AUTORELEASE) PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=@SF/pcre/$(PKG_NAME)/$(PKG_VERSION) PKG_SOURCE_URL:=@SF/pcre/$(PKG_NAME)/$(PKG_VERSION)
@ -28,6 +28,7 @@ PKG_CONFIG_DEPENDS:=\
PKG_BUILD_DEPENDS:=zlib PKG_BUILD_DEPENDS:=zlib
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/host-build.mk
include $(INCLUDE_DIR)/cmake.mk include $(INCLUDE_DIR)/cmake.mk
define Package/libpcre2/default define Package/libpcre2/default
@ -55,6 +56,18 @@ define Package/libpcre2-32
TITLE:=A Perl Compatible Regular Expression library (32bit support) TITLE:=A Perl Compatible Regular Expression library (32bit support)
endef endef
CMAKE_HOST_OPTIONS += \
-DBUILD_SHARED_LIBS=ON \
-DPCRE2_BUILD_PCRE2_8=ON \
-DPCRE2_BUILD_PCRE2_16=ON \
-DPCRE2_BUILD_PCRE2_32=ON \
-DPCRE2_DEBUG=OFF \
-DPCRE2_DISABLE_PERCENT_ZT=ON \
-DPCRE2_SUPPORT_JIT=OFF \
-DPCRE2_SHOW_REPORT=OFF \
-DPCRE2_BUILD_PCRE2GREP=OFF \
-DPCRE2_BUILD_TESTS=OFF
CMAKE_OPTIONS += \ CMAKE_OPTIONS += \
-DBUILD_SHARED_LIBS=ON \ -DBUILD_SHARED_LIBS=ON \
-DPCRE2_BUILD_PCRE2_8=ON \ -DPCRE2_BUILD_PCRE2_8=ON \
@ -92,3 +105,4 @@ endef
$(eval $(call BuildPackage,libpcre2)) $(eval $(call BuildPackage,libpcre2))
$(eval $(call BuildPackage,libpcre2-16)) $(eval $(call BuildPackage,libpcre2-16))
$(eval $(call BuildPackage,libpcre2-32)) $(eval $(call BuildPackage,libpcre2-32))
$(eval $(call HostBuild))

7
net/gensio/Makefile
View File

@ -33,7 +33,7 @@ PKG_CONFIG_DEPENDS:= \
CONFIG_GENSIO_TCL \ CONFIG_GENSIO_TCL \
CONFIG_GENSIO_SSHD CONFIG_GENSIO_SSHD
PKG_BUILD_DEPENDS:=PACKAGE_python3-gensio:swig PKG_BUILD_DEPENDS:=PACKAGE_python3-gensio:swig/host
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include ../../lang/python/python3-package.mk include ../../lang/python/python3-package.mk
@ -129,10 +129,11 @@ endef
define Package/python3-gensio define Package/python3-gensio
$(call Package/gensio/Default) $(call Package/gensio/Default)
TITLE+= (Python3-bindings) TITLE+= (Python bindings)
SECTION:=lang SECTION:=lang
CATEGORY:=Languages CATEGORY:=Languages
DEPENDS:=+PACKAGE_python3-gensio:python3-light +libgensio SUBMENU:=Python
DEPENDS:=+PACKAGE_python3-gensio:python3-light +libgensiocpp
endef endef
define Package/python3-gensio/description define Package/python3-gensio/description

3
utils/swig/Makefile
View File

@ -20,6 +20,7 @@ PKG_LICENSE_FILES:=LICENSE
PKG_HOST_ONLY:=1 PKG_HOST_ONLY:=1
HOST_BUILD_PARALLEL:=1 HOST_BUILD_PARALLEL:=1
HOST_BUILD_DEPENDS:=pcre2/host
include $(INCLUDE_DIR)/host-build.mk include $(INCLUDE_DIR)/host-build.mk
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
@ -33,7 +34,7 @@ define Package/swig
endef endef
HOST_CONFIGURE_ARGS += \ HOST_CONFIGURE_ARGS += \
--without-pcre --with-pcre
define Package/swig/description define Package/swig/description
tool that generates bindings for various languages tool that generates bindings for various languages