From patchwork Tue Mar 16 22:35:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rosen Penev X-Patchwork-Id: 1454341 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.openwrt.org (client-ip=2001:8b0:10b:1:d65d:64ff:fe57:4e05; helo=desiato.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=desiato.20200630 header.b=IyDn0zy5; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=jrStMZB5; dkim-atps=neutral Received: from desiato.infradead.org (desiato.infradead.org [IPv6:2001:8b0:10b:1:d65d:64ff:fe57:4e05]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4F0Spr4b7wz9sRf for ; Wed, 17 Mar 2021 09:37:37 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To:From: Reply-To:Cc:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=SBX7bLUp9muwve+NNDvBS1cAndeb6G3kXfTzygAMUvI=; b=IyDn0zy5BGBReR DSfmo0s39/Uqya7rinDUgVUaMpY/3AwLzYW3eNrK+CmnSpFgMg8hVpPGlO10K6ir0fhEKwXIIzG81 Da73mSpBCirbsMuZMB7IW+iK6dZJT8vDTn7NNhV+jHsq1l3OBCIw8YyxI3DxGcngwEyUTyv+Y3GIa qncBtzojpi1/xWdxgG4nDrQgXjCK9iotpGZnmdPF//4Q0PIiJBZIl4Hq/WtjMa3ERagbBnbK2t4kr NKMhlLu/0n8LO7DpNLWaTg3ZuU2dkwl9MjN837LnxOGu84JMpcy+A06oUKIJJXOQDrh/BTalklfD2 lsBGId8Zg2n08AAGdXRQ==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lMIHj-001yMj-EU; Tue, 16 Mar 2021 22:35:31 +0000 Received: from mail-pf1-x42d.google.com ([2607:f8b0:4864:20::42d]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lMIHc-001yM9-9f for openwrt-devel@lists.openwrt.org; Tue, 16 Mar 2021 22:35:27 +0000 Received: by mail-pf1-x42d.google.com with SMTP id t85so9790069pfc.13 for ; Tue, 16 Mar 2021 15:35:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=maNuQmX6PUgklHeGPyFvo4CYifB5wyAcZcxpkRfBY/s=; b=jrStMZB5REm4SJRMSSumcW2fyk50s/by1nfSvO8lZc1i2d5fzW2fD/2jQlD0PbjIPj vLihYgFX+FDLGMCIFsLeV+H+c3Q7n2Norbn6Nfgit2KAImzme6zYDRZien7Kqj/PQb+R GZgd8sx/nkYZb9KhZ/PLQCgPss60aoxZJO1SRWS2ZEjJYPYUeVyZuTCoVrVROq69dN6V SicSqXw1yqRJnmTwfZjZz+iCFRDffuCIRHOWJx4hoCdcodiI1giXPVARutGJQh10fZbc mYxg87I+PxFEMowoYhjpWUxzZQerfoAOjl/SH5fDwYs3vC8MPszNDczyPMJw2UDbmTpx /pxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=maNuQmX6PUgklHeGPyFvo4CYifB5wyAcZcxpkRfBY/s=; b=HJJKlrURsx+xEEt5c89Om8hoF9ArMp370+3Tkp/fZklJgD4a9XOagXJeeGZ2xLhBr7 5G+H4nzWxfYhTrOGRMFRcFUw/1H4hWj30ja6aAKCrs5GW0SjpSCaQcF3N2QIF2t20TQH jqbIL1S9nM0up6DXIOpI/B89JJ81JxIr5aiEwC4GqlRrr88e+YG0KUX6O1eG2GdVlOe3 rop7RClsrBdxTzH4oYBcYIQVPBL6ZX2kqZdJ2znvnfWhxRaLNkbCeaZibj+O4VlM6OCv zdUVuKJQvrqIUA+eAZMNLCo418v1+Nlmhg+6n99BY6AnWmNjTjpmsH1BulGoabLSsxzp 1JTA== X-Gm-Message-State: AOAM530eeMNK8WhgMHJd/Rhzj70fiTqnaOj5GkfNFrcIAo6+OL+Q9+9x gw9FEAIxbrg1KvQxu8i2wG0LPNWtwbOOoA== X-Google-Smtp-Source: ABdhPJyIsCF7BV3JS0zmMC5Qa4fAwziG4qSnsRJ6taP0UdB46SZQonFjv+sRAOaki86emNRH/Cxytg== X-Received: by 2002:aa7:9804:0:b029:1f1:5340:77c1 with SMTP id e4-20020aa798040000b02901f1534077c1mr1543370pfl.72.1615934122551; Tue, 16 Mar 2021 15:35:22 -0700 (PDT) Received: from DESKTOP-0U8QT52.lan ([2001:470:1f05:79e:4cc2:a8c6:92d5:dbc9]) by smtp.gmail.com with ESMTPSA id w26sm11054636pfj.58.2021.03.16.15.35.21 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Mar 2021 15:35:22 -0700 (PDT) From: Rosen Penev To: openwrt-devel@lists.openwrt.org Subject: [PATCH] pcre: bring back C++ bindings Date: Tue, 16 Mar 2021 15:35:26 -0700 Message-Id: <20210316223526.6915-1-rosenp@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210316_223525_486354_A065A2A2 X-CRM114-Status: UNSURE ( 7.46 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.2 (/) X-Spam-Report: Spam detection software, running on the system "desiato.infradead.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: It seems some people use them privately. Reported-by: Jan Kardell Signed-off-by: Rosen Penev --- package/libs/pcre/Makefile | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) Content analysis details: (-0.2 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:42d listed in] [list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [rosenp[at]gmail.com] -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org It seems some people use them privately. Reported-by: Jan Kardell Signed-off-by: Rosen Penev --- package/libs/pcre/Makefile | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/package/libs/pcre/Makefile b/package/libs/pcre/Makefile index 8644746b4b..60f30cd787 100644 --- a/package/libs/pcre/Makefile +++ b/package/libs/pcre/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=pcre PKG_VERSION:=8.44 -PKG_RELEASE:=4 +PKG_RELEASE:=5 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=@SF/$(PKG_NAME) @@ -24,6 +24,7 @@ PKG_INSTALL:=1 PKG_BUILD_PARALLEL:=1 PKG_CONFIG_DEPENDS:=\ + CONFIG_PACKAGE_libpcrecpp \ CONFIG_PCRE_JIT_ENABLED include $(INCLUDE_DIR)/package.mk @@ -54,12 +55,19 @@ define Package/libpcre32 TITLE:=A Perl Compatible Regular Expression library (32bit support) endef +define Package/libpcrecpp + $(call Package/libpcre/default) + TITLE:=C++ wrapper for Perl Compatible Regular Expression library + DEPENDS:=+libpcre +libstdcpp +endef + + HOST_CONFIGURE_ARGS += \ --enable-utf8 \ --enable-unicode-properties \ --enable-pcre16 \ --with-match-limit-recursion=16000 \ - --disable-cpp + --enable-cpp TARGET_CFLAGS += $(FPIC) @@ -70,7 +78,7 @@ CONFIGURE_ARGS += \ --enable-pcre32 \ $(if $(CONFIG_PCRE_JIT_ENABLED),--enable-jit,--disable-jit) \ --with-match-limit-recursion=16000 \ - -disable-cpp + --$(if $(CONFIG_PACKAGE_libpcrecpp),en,dis)able-cpp MAKE_FLAGS += \ CFLAGS="$(TARGET_CFLAGS)" @@ -109,7 +117,13 @@ define Package/libpcre32/install $(CP) $(PKG_INSTALL_DIR)/usr/lib/libpcre32.so* $(1)/usr/lib/ endef +define Package/libpcrecpp/install + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libpcrecpp.so.* $(1)/usr/lib/ +endef + $(eval $(call BuildPackage,libpcre)) $(eval $(call BuildPackage,libpcre16)) $(eval $(call BuildPackage,libpcre32)) +$(eval $(call BuildPackage,libpcrecpp)) $(eval $(call HostBuild))