jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-08-05 17:07:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3774 from MilhouseVH/le10_tinyxml2-7.0.1

Browse Source 
tinyxml2: update to tinyxml2-7.1.0
This commit is contained in:
Christian Hewitt 2019-10-25 04:40:31 +04:00 committed by GitHub
commit 3fad341db9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
packages/textproc/tinyxml2/package.mk
View File

@ -1,18 +1,17 @@
# SPDX-License-Identifier: GPL-2.0-or-later # SPDX-License-Identifier: GPL-2.0-or-later
# Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv) # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="tinyxml2" PKG_NAME="tinyxml2"
PKG_VERSION="1.0.12" PKG_VERSION="7.1.0"
PKG_SHA256="53a4dd1b3aed4aa05b18782e303646669d2d3b2de3c1919fe21aea319b44de7f" PKG_SHA256="68ebd396a4220d5a9b5a621c6e9c66349c5cfdf5efaea3f16e3bb92e45f4e2a3"
PKG_LICENSE="zlib" PKG_LICENSE="zlib"
PKG_SITE="http://www.grinninglizard.com/tinyxml2/index.html" PKG_SITE="http://www.grinninglizard.com/tinyxml2/index.html"
PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.gz" PKG_URL="https://github.com/leethomason/tinyxml2/archive/$PKG_VERSION.tar.gz"
PKG_DEPENDS_TARGET="toolchain" PKG_DEPENDS_TARGET="toolchain"
PKG_LONGDESC="TinyXML2 is a simple, small, C++ XML parser." PKG_LONGDESC="TinyXML2 is a simple, small, C++ XML parser."
PKG_BUILD_FLAGS="+pic"
PKG_CMAKE_OPTS_TARGET="-DBUILD_SHARED_LIBS=off -DBUILD_STATIC_LIBS=on" PKG_CMAKE_OPTS_TARGET="-DBUILD_SHARED_LIBS=OFF \
-DBUILD_TESTING=OFF \
-DCMAKE_BUILD_TYPE=Release"
post_makeinstall_target() {
rm -rf $INSTALL/usr
}

30
packages/textproc/tinyxml2/patches/tinyxml2-0001-really-disable-shared-build.patch
View File

@ -1,30 +0,0 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -51,26 +51,12 @@ if(BUILD_STATIC_LIBS)
add_library(tinyxml2static STATIC tinyxml2.cpp tinyxml2.h)
set_target_properties(tinyxml2static PROPERTIES OUTPUT_NAME tinyxml2)
endif(BUILD_STATIC_LIBS)
-add_library(tinyxml2 SHARED tinyxml2.cpp tinyxml2.h)
-set_target_properties(tinyxml2 PROPERTIES
- VERSION "${GENERIC_LIB_VERSION}"
- SOVERSION "${GENERIC_LIB_SOVERSION}")
-
-add_executable(test xmltest.cpp)
-add_dependencies(test tinyxml2)
-add_dependencies(test ${TARGET_DATA_COPY})
-target_link_libraries(test tinyxml2)
-
if(BUILD_STATIC_LIBS)
- install(TARGETS tinyxml2 tinyxml2static
+ install(TARGETS tinyxml2static
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
-else(BUILD_STATIC_LIBS)
- install(TARGETS tinyxml2
- RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
endif(BUILD_STATIC_LIBS)
install(FILES tinyxml2.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})