From patchwork Sat Jul 11 18:20:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rosen Penev X-Patchwork-Id: 1327373 X-Patchwork-Delegate: ynezz@true.cz 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; dmarc=fail (p=none dis=none) header.from=gmail.com 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=G+pAOSxN; 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=dyfIqsLf; 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 4B3yvj6gFGz9sSn for ; Sun, 12 Jul 2020 04:23:13 +1000 (AEST) 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=d52j/lv6S6bPBXbrwhKvRlaJZGGijomYyH2JDQ1ffl4=; b=G+pAOSxNMEFUSXMy3hI5rD7BCj xpqRyVyokRSuZO3G4Kxx9xf7wYrfX5zgqQXB48Sc7Quky0CiVdxP3SunsOlI4Rae2W8BMaTz+PvYk fHykDxhmVkkeznqza6vHL8wOphPgCBlnqUs4w13D4TeQGpORh8jpQ3/6zp2kpMDnECaK2L4YZ46Oo LWqTIqq//nIR2TEMpQbdV4Z+jo8IQsKaw085OGVTPkLxCbIOnmS6llAzniG8uzx+ejXuWfo9UZ3Ri mra6sFTJJIQkGqnxi7MaY9mQcranUr3l6d35pr0Jb487o+hZzb6F1QeA7vrUctRzpWjV7679o3+7V n5hurPuQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1juK6o-0000So-CG; Sat, 11 Jul 2020 18:20:22 +0000 Received: from mail-pf1-x441.google.com ([2607:f8b0:4864:20::441]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1juK6l-0000Ru-PT for openwrt-devel@lists.openwrt.org; Sat, 11 Jul 2020 18:20:21 +0000 Received: by mail-pf1-x441.google.com with SMTP id x72so3985627pfc.6 for ; Sat, 11 Jul 2020 11:20:19 -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=IRCpDnobLJbPSkT04iIMbT1DCYTZJKcpta3pcZmzhb4=; b=dyfIqsLfMM5g6IC9J3upVB+XSYEPzNwbn5FO9sh/1rQy8L9Mo+ZxRSljNs20baTyjJ XCh5f+AjcldhIJNZvEe8rg+pZioP+J3D2UUIua8+LRDzwExVHgAmZsz7zRP6eqMCze3D LH+KCp4DG19mnhFgGVRhkWyL4MCRNK6CdF9lnDDoVuhZ8TXESewvrWyD251kuwX8LMFR jEpCMg1LdUdIDwfg2OuJspgMm470+pwrFIjhbt3UjVf3CK8WrjIaK8OrJeynMF6y1Xpj GJqzzBKEemmrki4/xC8QGUlX8UMFEIWI4HbxzvUCGWHue1Nja+NXkD1zUyvISworX9Gc UTpg== 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=IRCpDnobLJbPSkT04iIMbT1DCYTZJKcpta3pcZmzhb4=; b=aShUE88YJqIWN4m2/LgMQZv1lJw+axMb0MQfDQxI2ARSzYM6kYfEvsSssXg+NkQoo7 iOQOCwN7C3+wAbPmdgPKLMnAwm6uSPb36/snVvPuvhMfQqVlU2Ycwa4czjzSzex5c2ki g1PZmASY0tXxWm7fuOs5tlneTev6z+CaDjurnmCvZrLw7Jo4H6fCIyEOjFn8BBNCKoZa Kzec/vSCyaK3Lpx/7svdtygxTtycUcZsw9uewhQMmxsI7i/A6gqsYMRD5AQthnYjPnom Ku4pfF/BgdwNGlHqfYiU61RMDdBlUVUkgiII/f/+0rpE28pe3ksY+Inn0WlYYC7jRlMx 4CVQ== X-Gm-Message-State: AOAM532gGfMJFWig2sQEWWrKa6Sa4semZZ8TqcAXkfux496k4b66y/Im lPfwrGAtufw2dKO7x5wQICMB0a8gh/c= X-Google-Smtp-Source: ABdhPJyFnzQnGtVndYdJoRHZD9zPMnUQB2LA+oYWZTOagSq4yHC0P8DU65kpuEF0a+UeLPZ/w0I6Kw== X-Received: by 2002:a62:27c4:: with SMTP id n187mr33005777pfn.208.1594491617472; Sat, 11 Jul 2020 11:20:17 -0700 (PDT) Received: from mangix-trapnet.lan (76-14-109-232.rk.wavecable.com. [76.14.109.232]) by smtp.gmail.com with ESMTPSA id p19sm9088684pgj.74.2020.07.11.11.20.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Jul 2020 11:20:16 -0700 (PDT) From: Rosen Penev To: openwrt-devel@lists.openwrt.org Subject: [PATCH] libroxml: switch to CMake Date: Sat, 11 Jul 2020 11:20:15 -0700 Message-Id: <20200711182015.26400-1-rosenp@gmail.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200711_142019_865960_3D2332FD X-CRM114-Status: UNSURE ( 9.79 ) 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:441 listed in] [list.dnswl.org] 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.0 SPF_PASS SPF: sender matches SPF record -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 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 Added patch to fix compilation with gcc10. Fixed license information. Fix ABI_VERSION. Signed-off-by: Rosen Penev --- package/libs/libroxml/Makefile | 26 +++++++++---------- package/libs/libroxml/patches/010-gcc10.patch | 11 ++++++++ 2 files changed, 24 insertions(+), 13 deletions(-) create mode 100644 package/libs/libroxml/patches/010-gcc10.patch diff --git a/package/libs/libroxml/Makefile b/package/libs/libroxml/Makefile index f60312b1ed..0fb1e3e71f 100644 --- a/package/libs/libroxml/Makefile +++ b/package/libs/libroxml/Makefile @@ -9,36 +9,36 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libroxml PKG_VERSION:=3.0.2 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://download.libroxml.net/pool/v3.x PKG_HASH:=ed6d68d1bceabf98e5e76907411e2e4d93b2dbd48479ab41dede851f59dad6a3 + PKG_MAINTAINER:=Felix Fietkau +PKG_LICENSE:=LGPL-2.1-or-later +PKG_LICENSE_FILES:=License.txt -PKG_INSTALL:=1 +CMAKE_INSTALL:=1 PKG_BUILD_PARALLEL:=1 -PKG_LICENSE:=LGPL-2.1+ include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/cmake.mk define Package/libroxml SECTION:=libs CATEGORY:=Libraries TITLE:=Minimum, easy-to-use, C implementation for xml file parsing URL:=http://www.libroxml.net/ - ABI_VERSION:=3.0.2 + ABI_VERSION:=2 endef -CONFIGURE_ARGS += \ - --enable-shared \ - --enable-static \ - --disable-roxml - -define Build/InstallDev - $(INSTALL_DIR) $(1) - $(CP) $(PKG_INSTALL_DIR)/* $(1)/ -endef +CMAKE_OPTIONS += \ + -DBUILD_TESTING=OFF \ + -DCONFIG_XML_FILE=OFF \ + -DCONFIG_XML_EDIT=OFF \ + -DCONFIG_XML_COMMIT=OFF \ + -DCONFIG_XML_XPATH=OFF define Package/libroxml/install $(INSTALL_DIR) $(1)/usr/lib diff --git a/package/libs/libroxml/patches/010-gcc10.patch b/package/libs/libroxml/patches/010-gcc10.patch new file mode 100644 index 0000000000..3c4fee6533 --- /dev/null +++ b/package/libs/libroxml/patches/010-gcc10.patch @@ -0,0 +1,11 @@ +--- a/src/roxml_mem.h ++++ b/src/roxml_mem.h +@@ -14,7 +14,7 @@ + + #include "roxml_internal.h" + +-memory_cell_t head_cell; ++extern memory_cell_t head_cell; + + /** \brief alloc memory function + *