-
Notifications
You must be signed in to change notification settings - Fork 45
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- OpenSSL 3.0.12 - Android NDK n26b - xerces-c 3.2.5 - nlohmann/json 3.11.3 IB-7906, IB-7909, IB-7936, IB-7937 Signed-off-by: Raul Metsma <raul@metsma.ee>
- Loading branch information
Showing
24 changed files
with
1,241 additions
and
790 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,15 +1,16 @@ | ||
| diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl | ||
| index dd96254..c4458ca 100644 | ||
| index c82c086..6c5402d 100644 | ||
| --- a/Configurations/unix-Makefile.tmpl | ||
| +++ b/Configurations/unix-Makefile.tmpl | ||
| @@ -689,6 +689,10 @@ install_ssldirs: | ||
| cp $(SRCDIR)/apps/ct_log_list.cnf $(DESTDIR)$(OPENSSLDIR)/ct_log_list.cnf; \ | ||
| chmod 644 $(DESTDIR)$(OPENSSLDIR)/ct_log_list.cnf; \ | ||
| @@ -690,6 +690,11 @@ install_ssldirs: | ||
| chmod 644 "$(DESTDIR)$(OPENSSLDIR)/ct_log_list.cnf"; \ | ||
| fi | ||
|
|
||
| + $(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(INSTALLTOP)$(OPENSSLDIR) | ||
| + for I in $(DESTDIR)$(OPENSSLDIR)/*; do \ | ||
| + mv $$I $(DESTDIR)$(INSTALLTOP)$(OPENSSLDIR)/; \ | ||
| + done | ||
| + | ||
| install_dev: install_runtime_libs | ||
| @[ -n "$(INSTALLTOP)" ] || (echo INSTALLTOP should not be empty; exit 1) | ||
| @$(ECHO) "*** Installing development files" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
10 changes: 5 additions & 5 deletions
10
patches/vcpkg-ports/openssl/unix/no-static-libs-for-shared.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +1,12 @@ | ||
| diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl | ||
| index 4c8c916..dd96254 100644 | ||
| index fc982df..10f1c54 100644 | ||
| --- a/Configurations/unix-Makefile.tmpl | ||
| +++ b/Configurations/unix-Makefile.tmpl | ||
| @@ -708,6 +708,7 @@ install_dev: install_runtime_libs | ||
| @@ -713,6 +713,7 @@ install_dev: install_runtime_libs | ||
| done | ||
| @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(libdir) | ||
| @$(PERL) $(SRCDIR)/util/mkdir-p.pl "$(DESTDIR)$(libdir)" | ||
| @set -e; for l in $(INSTALL_LIBS); do \ | ||
| + if [ -n "$(INSTALL_SHLIBS)" ] ; then continue ; fi ; \ | ||
| + if [ -n "$(INSTALL_SHLIBS)" ] ; then continue ; fi ; \ | ||
| fn=`basename $$l`; \ | ||
| $(ECHO) "install $$l -> $(DESTDIR)$(libdir)/$$fn"; \ | ||
| cp $$l $(DESTDIR)$(libdir)/$$fn.new; \ | ||
| cp $$l "$(DESTDIR)$(libdir)/$$fn.new"; \ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,77 @@ | ||
| diff --git a/cmake/XercesNetAccessorSelection.cmake b/cmake/XercesNetAccessorSelection.cmake | ||
| index 7a63f1f..22ea65b 100644 | ||
| --- a/cmake/XercesNetAccessorSelection.cmake | ||
| +++ b/cmake/XercesNetAccessorSelection.cmake | ||
| @@ -23,7 +23,7 @@ option(network "Network support" ON) | ||
|
|
||
| if(network) | ||
| find_library(SOCKET_LIBRARY socket) | ||
| - find_library(NSL_LIBRARY nsl) | ||
| + set(NSL_LIBRARY "" CACHE INTERNAL "Not used") | ||
|
|
||
| # netaccessors in order of preference | ||
|
|
||
| diff --git a/cmake/XercesTranscoderSelection.cmake b/cmake/XercesTranscoderSelection.cmake | ||
| index 4ff5b16..48e274c 100644 | ||
| --- a/cmake/XercesTranscoderSelection.cmake | ||
| +++ b/cmake/XercesTranscoderSelection.cmake | ||
| @@ -25,6 +25,7 @@ | ||
|
|
||
| if(ICU_FOUND) | ||
| list(APPEND transcoders icu) | ||
| + set(TRANSCODER_REQUIRES "icu-uc") | ||
| endif() | ||
|
|
||
| # MacOS | ||
| @@ -41,6 +42,20 @@ endif() | ||
|
|
||
| # GNU iconv | ||
|
|
||
| +if(NOT transcoder AND NOT transcoders AND NOT WIN32) | ||
| + find_package(Iconv) | ||
| + set(FIND_DEPENDENCY_ICONV "${Iconv_FOUND}") | ||
| + if(Iconv_FOUND AND NOT Iconv_IS_BUILT_IN) | ||
| + list(APPEND libxerces_c_DEPS Iconv::Iconv) | ||
| + set(TRANSCODER_LIBS "-liconv -lcharset") | ||
| + list(APPEND CMAKE_REQUIRED_LIBRARIES Iconv::Iconv) | ||
| + include(CheckSymbolExists) | ||
| + check_symbol_exists(iconv_open "iconv.h" HAVE_ICONV_OPEN) | ||
| + check_symbol_exists(iconv_close "iconv.h" HAVE_ICONV_CLOSE) | ||
| + check_symbol_exists(iconv "iconv.h" HAVE_ICONV) | ||
| + endif() | ||
| +endif() | ||
| + | ||
| check_include_file_cxx(iconv.h HAVE_ICONV_H) | ||
| check_include_file_cxx(wchar.h HAVE_WCHAR_H) | ||
| check_include_file_cxx(string.h HAVE_STRING_H) | ||
| diff --git a/src/XercesCConfig.cmake.in b/src/XercesCConfig.cmake.in | ||
| index aa8fc2e..754c425 100644 | ||
| --- a/src/XercesCConfig.cmake.in | ||
| +++ b/src/XercesCConfig.cmake.in | ||
| @@ -1,5 +1,14 @@ | ||
| @PACKAGE_INIT@ | ||
|
|
||
| +include(CMakeFindDependencyMacro) | ||
| +find_dependency(Threads) | ||
| +if("@CMAKE_REQUIRE_FIND_PACKAGE_ICU@") | ||
| + find_dependency(ICU COMPONENTS uc data) | ||
| +endif() | ||
| +if("@FIND_DEPENDENCY_ICONV@") | ||
| + find_dependency(Iconv) | ||
| +endif() | ||
| + | ||
| include(${CMAKE_CURRENT_LIST_DIR}/XercesCConfigInternal.cmake) | ||
|
|
||
| add_library(XercesC::XercesC INTERFACE IMPORTED) | ||
| diff --git a/xerces-c.pc.in b/xerces-c.pc.in | ||
| index 16b18c7..077296b 100644 | ||
| --- a/xerces-c.pc.in | ||
| +++ b/xerces-c.pc.in | ||
| @@ -7,5 +7,6 @@ Name: Xerces-C++ | ||
| Description: Validating XML parser library for C++ | ||
| Version: @VERSION@ | ||
| Libs: -L${libdir} -lxerces-c | ||
| -Libs.private: @CURL_LIBS@ | ||
| +Libs.private: @CURL_LIBS@ @TRANSCODER_LIBS@ | ||
| +Requires.private: @TRANSCODER_REQUIRES@ | ||
| Cflags: -I${includedir} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| index 4254f89..aa08565 100644 | ||
| --- a/CMakeLists.txt | ||
| +++ b/CMakeLists.txt | ||
| @@ -175,10 +175,16 @@ install( | ||
| COMPONENT "development") | ||
|
|
||
| # Process subdirectories | ||
| +if(NOT DISABLE_DOC) | ||
| add_subdirectory(doc) | ||
| +endif() | ||
| add_subdirectory(src) | ||
| +if(NOT DISABLE_TESTS) | ||
| add_subdirectory(tests) | ||
| +endif() | ||
| +if(NOT DISABLE_SAMPLES) | ||
| add_subdirectory(samples) | ||
| +endif() | ||
|
|
||
| # Display configuration summary | ||
| message(STATUS "") |
Oops, something went wrong.