From patchwork Thu Jan 21 05:38:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rosen Penev X-Patchwork-Id: 1429638 X-Patchwork-Delegate: hauke@hauke-m.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.openwrt.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.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=merlin.20170209 header.b=Ojp9I8Ve; 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=J4TYk/yo; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (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 4DLrpV4Yf3z9rx8 for ; Thu, 21 Jan 2021 16:40:50 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; 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=++8pRYqjeBm8QwOxalfehuri30ecHmc0MiIVFFh+fjs=; b=Ojp9I8VeJ0SYEZYPYErwC+Szh2 TCHQn30vXJDpWuEyydpaI3ia6czi5/ybqcS3LWavXwDhq6vZwGJwin96uM0qsPlaDph4oy4xgEPau VB1oDEZeJuUz+E7510B2lYKGsP9FNh0bCLqFVRckXM95C14gxcUhhKO1hw1G6kVuL+Z3R6/oajtFp eIIhzq4su69O3sP4C4CWMc/8RrZ7ohhm78LPAx+62Wqbnpitw0c2juT04eSkOohZ8u9wbpiny2lCi RluINuPZVO/XLq/UndHE4kY6ZJhOLXtnhtE6wW1Jc/C4YzRp4RUBTuadqPgxLYsY0d0DoSNnLnPYa YK8Ps8iw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l2Sfb-000548-7r; Thu, 21 Jan 2021 05:38:11 +0000 Received: from mail-pf1-x42f.google.com ([2607:f8b0:4864:20::42f]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1l2SfY-00053H-FI for openwrt-devel@lists.openwrt.org; Thu, 21 Jan 2021 05:38:09 +0000 Received: by mail-pf1-x42f.google.com with SMTP id w18so834546pfu.9 for ; Wed, 20 Jan 2021 21:38:07 -0800 (PST) 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=URtnpGAZ9Ke3flz8kPaFh5lmwZmPD61chwKFaRLaRwc=; b=J4TYk/yo5NTHwzwV3+KZAkyOk9Rl2T9Tz8499STOJm9ZzEtDd7mHP03wX2GjNXdeNJ /wDdoVmFLa8fwPY3Xfi4618fWTZBaa8iR9ipRP5c09MzsOl55nU9GqPP0adFJGpaZaei sXmqH8tV4OXYctPI3lcT0Ga15crDgu5CeEEEn33hjDhiZkMEEmoBi+2uP3dC0FIAd66V BF2BH66Ud+9Jvr0QXjtoA21BF9gE3wImK2/waE/GnsPJoKsQw/vK20k/eNkeVxz8yTUD XRWjOCA6o9MY4yGBr+pz9oB4+rfY8TH6sGMfpq2AEXqL1Ft7eEXGWbBdJFut20Cav/Tg RGSw== 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=URtnpGAZ9Ke3flz8kPaFh5lmwZmPD61chwKFaRLaRwc=; b=paoEstjbt4dVcNu5+ZSVwfstPlgpsayfvCDvQcmjuppGQq/pM+0TWFOxdboBpnu8jl AFZ+uUYv7KbFXNpkiIwCMMAyKnPf1HxQNE8//1znocNe6qfNWYclP/fgHMTC4jSrR3VX 8vVR/o7Tk/aP5yxgvYTsHYqQW2HO/fbW0W084wWBEkdxMchL5ZN03sqtq+lGRMBf2H+w 4MR0Hps9oY5bCBXzxty6jXRoESia8oDxmPxcfkuvbfwGlkwTALhtPuTgWqIXUdQhDZE5 FwcteuiYaUbhjPjd8AfQI3jpBB3jNUivuC6XX37wgEMHFYi9lA2fpWzGy98JsmWocUbX xICg== X-Gm-Message-State: AOAM533MT+XNdnUlygU3igU5QXrbCjwujN7X1f56oZCxCGtEm1cFmmbd Dwy+Z7CuNTZdkek92y69SyzzKdq2QlMPsQ== X-Google-Smtp-Source: ABdhPJztJHFrLIdsQo9tL1if+hUOTH/u1eIUsea5NcDnVHPZHi1NqulabP0IK7wG0m7jQ9NbKrhpRg== X-Received: by 2002:a62:790a:0:b029:1b4:80d4:c246 with SMTP id u10-20020a62790a0000b02901b480d4c246mr12438218pfc.71.1611207485806; Wed, 20 Jan 2021 21:38:05 -0800 (PST) Received: from mangix-trapnet.lan ([2001:470:1f05:79e::a89]) by smtp.gmail.com with ESMTPSA id 202sm1740645pfy.93.2021.01.20.21.38.04 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Jan 2021 21:38:05 -0800 (PST) From: Rosen Penev To: openwrt-devel@lists.openwrt.org Subject: [PATCH] pcre: disable C++ bindings Date: Wed, 20 Jan 2021 21:38:03 -0800 Message-Id: <20210121053803.2227179-1-rosenp@gmail.com> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210121_003808_531519_40333746 X-CRM114-Status: UNSURE ( 9.77 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.2 points) 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:42f listed in] [list.dnswl.org] -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.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -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.29 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 Nothing uses them. Allows to simplify the Makefile. Signed-off-by: Rosen Penev --- package/libs/pcre/Makefile | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/package/libs/pcre/Makefile b/package/libs/pcre/Makefile index 37d939da7f..8644746b4b 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:=3 +PKG_RELEASE:=4 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=@SF/$(PKG_NAME) @@ -24,10 +24,8 @@ PKG_INSTALL:=1 PKG_BUILD_PARALLEL:=1 PKG_CONFIG_DEPENDS:=\ - CONFIG_PACKAGE_libpcrecpp \ CONFIG_PCRE_JIT_ENABLED -include $(INCLUDE_DIR)/uclibc++.mk include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/host-build.mk @@ -56,19 +54,12 @@ 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 $(CXX_DEPENDS) -endef - - HOST_CONFIGURE_ARGS += \ --enable-utf8 \ --enable-unicode-properties \ --enable-pcre16 \ --with-match-limit-recursion=16000 \ - --enable-cpp + --disable-cpp TARGET_CFLAGS += $(FPIC) @@ -79,7 +70,7 @@ CONFIGURE_ARGS += \ --enable-pcre32 \ $(if $(CONFIG_PCRE_JIT_ENABLED),--enable-jit,--disable-jit) \ --with-match-limit-recursion=16000 \ - $(if $(CONFIG_PACKAGE_libpcrecpp),--enable,--disable)-cpp + -disable-cpp MAKE_FLAGS += \ CFLAGS="$(TARGET_CFLAGS)" @@ -118,13 +109,7 @@ 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))