Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #12728 from neheb/xer2

Browse source 
libxerces-c: switch to CMake
This commit is contained in:
Rosen Penev 2020-07-07 16:01:42 -07:00 committed by GitHub
commit b0a535a2cc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
libs/libxerces-c/Makefile
View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=xerces-c PKG_NAME:=xerces-c
PKG_VERSION:=3.2.3 PKG_VERSION:=3.2.3
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=@APACHE/xerces/c/3/sources PKG_SOURCE_URL:=@APACHE/xerces/c/3/sources
@ -19,12 +19,11 @@ PKG_MAINTAINER:=Álvaro Fernández Rojas <noltari@gmail.com>
PKG_LICENSE:=Apache-2.0 PKG_LICENSE:=Apache-2.0
PKG_LICENSE_FILES:=LICENSE PKG_LICENSE_FILES:=LICENSE
PKG_FIXUP:=autoreconf
PKG_INSTALL:=1
PKG_BUILD_PARALLEL:=1 PKG_BUILD_PARALLEL:=1
include $(INCLUDE_DIR)/nls.mk include $(INCLUDE_DIR)/nls.mk
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/cmake.mk
define Package/libxerces-c/Default define Package/libxerces-c/Default
SECTION:=libs SECTION:=libs
@ -60,21 +59,20 @@ define Package/libxerces-c-samples/description
Validating XML parser library for C++ (samples) Validating XML parser library for C++ (samples)
endef endef
CONFIGURE_ARGS += \ CMAKE_OPTIONS += \
--disable-rpath \ -DCMAKE_DISABLE_FIND_PACKAGE_ICU=ON \
--enable-msgloader-inmemory \ -Dmessage-loader=inmemory \
--enable-netaccessor-socket \ -Dnetwork-accessor=socket \
--enable-transcoder-iconv \ -Dtranscoder=iconv
--with-pic
TARGET_LDFLAGS += -Wl,--gc-sections,--as-needed
define Build/InstallDev define Build/InstallDev
$(INSTALL_DIR) $(1)/usr/include/xercesc/ $(INSTALL_DIR) $(1)/usr/include/xercesc
$(CP) $(PKG_INSTALL_DIR)/usr/include/xercesc/* $(1)/usr/include/xercesc/ $(CP) $(PKG_INSTALL_DIR)/usr/include/xercesc/* $(1)/usr/include/xercesc/
$(INSTALL_DIR) $(1)/usr/lib $(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/{*.a,*.so} $(1)/usr/lib/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so $(1)/usr/lib/
$(INSTALL_DIR) $(1)/usr/lib/pkgconfig/ $(INSTALL_DIR) $(1)/usr/lib/cmake/XercesC
$(CP) $(PKG_INSTALL_DIR)/usr/lib/cmake/XercesC/* $(1)/usr/lib/cmake/XercesC
$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/xerces-c.pc $(1)/usr/lib/pkgconfig/xerces-c.pc $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/xerces-c.pc $(1)/usr/lib/pkgconfig/xerces-c.pc
endef endef

20
libs/libxerces-c/patches/0001-fix-configure-cross-compiling.patch
View file

@ -1,20 +0,0 @@
--- a/configure.ac
+++ b/configure.ac
@@ -228,7 +228,7 @@ AC_COMPILE_IFELSE( [AC_LANG_PROGRAM([[#
]
)
AC_MSG_CHECKING([for wcsrtombs])
-AC_RUN_IFELSE( [AC_LANG_PROGRAM([[#include <wchar.h>
+AC_COMPILE_IFELSE( [AC_LANG_PROGRAM([[#include <wchar.h>
#include <string.h>]],
[[
mbstate_t st;
@@ -250,7 +250,7 @@ else
]
)
AC_MSG_CHECKING([for mbsrtowcs])
-AC_RUN_IFELSE( [AC_LANG_PROGRAM([[#include <wchar.h>
+AC_COMPILE_IFELSE( [AC_LANG_PROGRAM([[#include <wchar.h>
#include <string.h>]],
[[
mbstate_t st;