From 55a015a2b4884b745538954b6b4227a29f4d7ad3 Mon Sep 17 00:00:00 2001 From: Michael Heimpold Date: Tue, 14 Mar 2023 20:53:07 +0100 Subject: [PATCH 1/4] pcre2: add host build (refs #20604) This adds a host build which can be used later by tools, e.g. swig - which in turn is used by gensio package to provide python bindings. While at, switch back from $(AUTORELEASE). Signed-off-by: Michael Heimpold --- libs/pcre2/Makefile | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/libs/pcre2/Makefile b/libs/pcre2/Makefile index 1bd6d2759..8abdd5d71 100644 --- a/libs/pcre2/Makefile +++ b/libs/pcre2/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=pcre2 PKG_VERSION:=10.37 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=@SF/pcre/$(PKG_NAME)/$(PKG_VERSION) @@ -28,6 +28,7 @@ PKG_CONFIG_DEPENDS:=\ PKG_BUILD_DEPENDS:=zlib include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/host-build.mk include $(INCLUDE_DIR)/cmake.mk define Package/libpcre2/default @@ -55,6 +56,18 @@ define Package/libpcre2-32 TITLE:=A Perl Compatible Regular Expression library (32bit support) 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 += \ -DBUILD_SHARED_LIBS=ON \ -DPCRE2_BUILD_PCRE2_8=ON \ @@ -92,3 +105,4 @@ endef $(eval $(call BuildPackage,libpcre2)) $(eval $(call BuildPackage,libpcre2-16)) $(eval $(call BuildPackage,libpcre2-32)) +$(eval $(call HostBuild)) From 15af23b011ad4248c3bb476dbbd196fce7091075 Mon Sep 17 00:00:00 2001 From: Michael Heimpold Date: Tue, 14 Mar 2023 20:54:59 +0100 Subject: [PATCH 2/4] swig: enable pcre2 support (refs #20604) Now since pcre2 provides a host build, let's use it. This is required for e.g. gensio package to provide python bindings. Signed-off-by: Michael Heimpold --- utils/swig/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/utils/swig/Makefile b/utils/swig/Makefile index 03378e196..ecd128f52 100644 --- a/utils/swig/Makefile +++ b/utils/swig/Makefile @@ -20,6 +20,7 @@ PKG_LICENSE_FILES:=LICENSE PKG_HOST_ONLY:=1 HOST_BUILD_PARALLEL:=1 +HOST_BUILD_DEPENDS:=pcre2/host include $(INCLUDE_DIR)/host-build.mk include $(INCLUDE_DIR)/package.mk @@ -33,7 +34,7 @@ define Package/swig endef HOST_CONFIGURE_ARGS += \ - --without-pcre + --with-pcre define Package/swig/description tool that generates bindings for various languages From 5b3575eba13b8da412dce26b009ac90870f49e8d Mon Sep 17 00:00:00 2001 From: Michael Heimpold Date: Tue, 14 Mar 2023 20:58:04 +0100 Subject: [PATCH 3/4] gensio: fix build of Python binding (refs #20604) We need the host build of swig only. And the binding uses libgensiocpp - not the plain C library, so fix the dependency. Signed-off-by: Michael Heimpold --- net/gensio/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/gensio/Makefile b/net/gensio/Makefile index 2744a2acc..f9d6ccc9d 100644 --- a/net/gensio/Makefile +++ b/net/gensio/Makefile @@ -33,7 +33,7 @@ PKG_CONFIG_DEPENDS:= \ CONFIG_GENSIO_TCL \ CONFIG_GENSIO_SSHD -PKG_BUILD_DEPENDS:=PACKAGE_python3-gensio:swig +PKG_BUILD_DEPENDS:=PACKAGE_python3-gensio:swig/host include $(INCLUDE_DIR)/package.mk include ../../lang/python/python3-package.mk @@ -132,7 +132,7 @@ $(call Package/gensio/Default) TITLE+= (Python3-bindings) SECTION:=lang CATEGORY:=Languages - DEPENDS:=+PACKAGE_python3-gensio:python3-light +libgensio + DEPENDS:=+PACKAGE_python3-gensio:python3-light +libgensiocpp endef define Package/python3-gensio/description From 31a18de442aac1b806d81e95b141d533ee95a2af Mon Sep 17 00:00:00 2001 From: Michael Heimpold Date: Tue, 14 Mar 2023 21:00:14 +0100 Subject: [PATCH 4/4] gensio: move package into Python submenu While at, fine-tune the description string slightly. Signed-off-by: Michael Heimpold --- net/gensio/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/gensio/Makefile b/net/gensio/Makefile index f9d6ccc9d..c49da8e13 100644 --- a/net/gensio/Makefile +++ b/net/gensio/Makefile @@ -129,9 +129,10 @@ endef define Package/python3-gensio $(call Package/gensio/Default) - TITLE+= (Python3-bindings) + TITLE+= (Python bindings) SECTION:=lang CATEGORY:=Languages + SUBMENU:=Python DEPENDS:=+PACKAGE_python3-gensio:python3-light +libgensiocpp endef