From 60bdade49c4e154418fb1d86147a59a161c25f44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= Date: Tue, 31 Mar 2015 19:27:16 +0200 Subject: [PATCH] libxerces-c: update to latest version, clean configure and fix iconv dependencies 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 | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/libs/libxerces-c/Makefile b/libs/libxerces-c/Makefile index c2dd097272..e892084ea8 100644 --- a/libs/libxerces-c/Makefile +++ b/libs/libxerces-c/Makefile @@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libxerces-c -PKG_VERSION:=3.1.1 +PKG_VERSION:=3.1.2 PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=git://git.apache.org/xerces-c.git PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE_VERSION:=Xerces-C_3_1_1 +PKG_SOURCE_VERSION:=Xerces-C_3_1_2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_MAINTAINER:=Álvaro Fernández Rojas @@ -22,10 +22,11 @@ PKG_LICENSE:=Apache-2.0 PKG_LICENSE_FILES:=LICENSE PKG_BUILD_PARALLEL:=1 -PKG_FIXUP:=libtool +PKG_FIXUP:=autoreconf PKG_INSTALL:=1 include $(INCLUDE_DIR)/uclibc++.mk +include $(INCLUDE_DIR)/nls.mk include $(INCLUDE_DIR)/package.mk CONFIGURE_ARGS += \ @@ -34,14 +35,7 @@ CONFIGURE_ARGS += \ --enable-netaccessor-socket \ --enable-msgloader-inmemory -TARGET_CFLAGS += \ - -I$(STAGING_DIR)/usr/lib/libiconv-full/include - -TARGET_CPPFLAGS += \ - -I$(STAGING_DIR)/usr/lib/libiconv-full/include - TARGET_LDFLAGS += \ - -L$(STAGING_DIR)/usr/lib/libiconv-full/lib \ -lm define Package/libxerces-c @@ -49,7 +43,7 @@ define Package/libxerces-c CATEGORY:=Libraries TITLE:=Validating XML parser library for C++ URL:=http://xerces.apache.org/ - DEPENDS:=$(CXX_DEPENDS) +libc +libiconv +libpthread + DEPENDS:=$(CXX_DEPENDS) $(ICONV_DEPENDS) +libc +libpthread endef define Package/libxerces-c-samples @@ -60,12 +54,6 @@ define Package/libxerces-c-samples DEPENDS:=+libxerces-c endef -define Build/Configure - (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \ - ./reconf;) - $(call Build/Configure/Default) -endef - define Package/libxerces-c/description Xerces-C++ is a validating XML parser written in a portable subset of C++. Xerces-C++ makes it easy to give your application the ability