Browse Source

libroxml: switch to CMake

Added patch to fix compilation with gcc10.

Fixed license information.

Fix ABI_VERSION.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
lilik-openwrt-22.03
Rosen Penev 4 years ago
parent
commit
99b347905e
No known key found for this signature in database GPG Key ID: 36D31CFA845F0E3B
2 changed files with 24 additions and 13 deletions
  1. +13
    -13
      libs/libroxml/Makefile
  2. +11
    -0
      libs/libroxml/patches/010-gcc10.patch

+ 13
- 13
libs/libroxml/Makefile View File

@ -9,36 +9,36 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=libroxml PKG_NAME:=libroxml
PKG_VERSION:=3.0.2 PKG_VERSION:=3.0.2
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://download.libroxml.net/pool/v3.x PKG_SOURCE_URL:=http://download.libroxml.net/pool/v3.x
PKG_HASH:=ed6d68d1bceabf98e5e76907411e2e4d93b2dbd48479ab41dede851f59dad6a3 PKG_HASH:=ed6d68d1bceabf98e5e76907411e2e4d93b2dbd48479ab41dede851f59dad6a3
PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name> PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
PKG_LICENSE:=LGPL-2.1-or-later
PKG_LICENSE_FILES:=License.txt
PKG_INSTALL:=1
CMAKE_INSTALL:=1
PKG_BUILD_PARALLEL:=1 PKG_BUILD_PARALLEL:=1
PKG_LICENSE:=LGPL-2.1+
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/cmake.mk
define Package/libroxml define Package/libroxml
SECTION:=libs SECTION:=libs
CATEGORY:=Libraries CATEGORY:=Libraries
TITLE:=Minimum, easy-to-use, C implementation for xml file parsing TITLE:=Minimum, easy-to-use, C implementation for xml file parsing
URL:=http://www.libroxml.net/ URL:=http://www.libroxml.net/
ABI_VERSION:=3.0.2
ABI_VERSION:=2
endef 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 define Package/libroxml/install
$(INSTALL_DIR) $(1)/usr/lib $(INSTALL_DIR) $(1)/usr/lib


+ 11
- 0
libs/libroxml/patches/010-gcc10.patch View File

@ -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
*

Loading…
Cancel
Save