From 8cdc1eb4328a38bcf8f75f6d7a82fc6523fb5bb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= Date: Sun, 31 Dec 2017 18:36:12 +0100 Subject: [PATCH] libxerces-c: update to v3.2.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Álvaro Fernández Rojas --- libs/libxerces-c/Makefile | 11 +++++----- .../0001-fix-configure-cross-compiling.patch | 20 +++++++++++++++++++ 2 files changed, 26 insertions(+), 5 deletions(-) create mode 100644 libs/libxerces-c/patches/0001-fix-configure-cross-compiling.patch diff --git a/libs/libxerces-c/Makefile b/libs/libxerces-c/Makefile index c38170c76..e13a0201c 100644 --- a/libs/libxerces-c/Makefile +++ b/libs/libxerces-c/Makefile @@ -8,12 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=xerces-c -PKG_VERSION:=3.1.4 -PKG_RELEASE:=2 +PKG_MAIN_VER:=3.2 +PKG_VERSION:=3.2.0 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@APACHE/xerces/c/3/sources -PKG_HASH:=9973cc79481803f8b6652c52faf5195d963f50d209d4f681ec97e2aa014b6241 +PKG_HASH:=35d8db18ebe6db353850903981cd07cca64abeba071602e7e32596714352de08 PKG_MAINTAINER:=Álvaro Fernández Rojas PKG_LICENSE:=Apache-2.0 @@ -72,14 +73,14 @@ define Build/InstallDev $(INSTALL_DIR) $(1)/usr/include/xercesc/ $(CP) $(PKG_INSTALL_DIR)/usr/include/xercesc/* $(1)/usr/include/xercesc/ $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/{libxerces-c.a,libxerces-c-3.1.so,libxerces-c.so} $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/{libxerces-c.a,libxerces-c-$(PKG_MAIN_VER).so,libxerces-c.so} $(1)/usr/lib/ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/xerces-c.pc $(1)/usr/lib/pkgconfig/xerces-c.pc endef define Package/libxerces-c/install $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/{libxerces-c-3.1.so,libxerces-c.so} $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/{libxerces-c-$(PKG_MAIN_VER).so,libxerces-c.so} $(1)/usr/lib/ endef define Package/libxerces-c-samples/install diff --git a/libs/libxerces-c/patches/0001-fix-configure-cross-compiling.patch b/libs/libxerces-c/patches/0001-fix-configure-cross-compiling.patch new file mode 100644 index 000000000..9e639acb5 --- /dev/null +++ b/libs/libxerces-c/patches/0001-fix-configure-cross-compiling.patch @@ -0,0 +1,20 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -194,7 +194,7 @@ AC_COMPILE_IFELSE( [AC_LANG_PROGRAM([[# + ] + ) + AC_MSG_CHECKING([for wcsrtombs]) +-AC_RUN_IFELSE( [AC_LANG_PROGRAM([[#include ++AC_COMPILE_IFELSE( [AC_LANG_PROGRAM([[#include + #include ]], + [[ + mbstate_t st; +@@ -216,7 +216,7 @@ else + ] + ) + AC_MSG_CHECKING([for mbsrtowcs]) +-AC_RUN_IFELSE( [AC_LANG_PROGRAM([[#include ++AC_COMPILE_IFELSE( [AC_LANG_PROGRAM([[#include + #include ]], + [[ + mbstate_t st;