Skip to content

Commit

Permalink
TEMP
Browse files Browse the repository at this point in the history
  • Loading branch information
AlwinEsch committed Mar 24, 2024
1 parent 1a5c9ab commit c4e9372
Show file tree
Hide file tree
Showing 3 changed files with 53 additions and 39 deletions.
Original file line number Diff line number Diff line change
@@ -1,6 +1,17 @@
From 89a2527093ce6ada25bc3f3d6fa5070f1180716b Mon Sep 17 00:00:00 2001
From: Alwin Esch <[email protected]>
Date: Sun, 24 Mar 2024 13:02:53 +0100
Subject: [PATCH 1/3] check-about-readline-lib-also-presence-of-header

---
CMakeLists.txt | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3a074da..309adb0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -151,7 +151,10 @@ if (NOT MSVC)
@@ -142,7 +142,10 @@ if (NOT MSVC)
check_include_files(inttypes.h HAVE_INTTYPES_H)
check_function_exists(isascii HAVE_ISASCII)
check_library_exists(history append_history "" HAVE_LIBHISTORY)
Expand All @@ -12,3 +23,6 @@
check_function_exists(mmap HAVE_MMAP)
check_function_exists(munmap HAVE_MUNMAP)
check_include_files(netdb.h HAVE_NETDB_H)
--
2.44.0.windows.1

16 changes: 15 additions & 1 deletion depends/common/libxml2/0002-disable-docs.patch
Original file line number Diff line number Diff line change
@@ -1,6 +1,17 @@
From 2244387e4d78bd01c10a0d808837f0f7912f181b Mon Sep 17 00:00:00 2001
From: Alwin Esch <[email protected]>
Date: Sun, 24 Mar 2024 13:03:19 +0100
Subject: [PATCH 2/3] disable-docs

---
CMakeLists.txt | 10 ----------
1 file changed, 10 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 309adb0..85bcab3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -574,16 +574,6 @@ if(LIBXML2_WITH_PYTHON)
@@ -606,16 +606,6 @@ if(LIBXML2_WITH_PYTHON)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libxml2.py DESTINATION ${LIBXML2_PYTHON_INSTALL_DIR} COMPONENT runtime)
endif()

Expand All @@ -17,3 +28,6 @@

configure_package_config_file(
libxml2-config.cmake.cmake.in libxml2-config.cmake
--
2.44.0.windows.1

60 changes: 23 additions & 37 deletions depends/common/libxml2/0003-fix_cmakelist.patch
Original file line number Diff line number Diff line change
@@ -1,34 +1,29 @@
From 9474e9339d2993dc1a892e526e2348c07c5a0ebf Mon Sep 17 00:00:00 2001
From: Alwin Esch <[email protected]>
Date: Sun, 24 Mar 2024 13:11:27 +0100
Subject: [PATCH 3/3] fix_cmakelist

---
CMakeLists.txt | 34 +++++++++++-----------------------
1 file changed, 11 insertions(+), 23 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 85bcab3..58ec2a1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -396,15 +396,15 @@ endif()
@@ -390,9 +390,9 @@ endif()
if(LIBXML2_WITH_ICU)
target_link_libraries(LibXml2 PRIVATE ICU::data ICU::i18n ICU::uc)
if(WIN32)
- set(ICU_LIBS "-licudt -licuin -licuuc")
+ set(ICU_LIBS "icu-i18n")
- set(ICU_LDFLAGS "-licudt -licuin -licuuc")
+ set(ICU_LDFLAGS "icu-i18n")
else()
- set(ICU_LIBS "-licudata -licui18n -licuuc")
+ set(ICU_LIBS "icu-i18n")
- set(ICU_LDFLAGS "-licudata -licui18n -licuuc")
+ set(ICU_LDFLAGS "icu-i18n")
endif()
endif()

if(LIBXML2_WITH_LZMA)
target_link_libraries(LibXml2 PRIVATE LibLZMA::LibLZMA)
- set(LZMA_LIBS "-llzma")
+ set(LZMA_LIBS "liblzma")
endif()

if(LIBXML2_WITH_THREADS)
@@ -414,7 +414,7 @@ endif()

if(LIBXML2_WITH_ZLIB)
target_link_libraries(LibXml2 PRIVATE ZLIB::ZLIB)
- set(Z_LIBS "-lz")
+ set(Z_LIBS "zlib")
endif()

set_target_properties(
@@ -428,23 +428,11 @@ set_target_properties(
list(APPEND XML_PRIVATE_LIBS "${ICU_LDFLAGS}")
pkg_check_modules(ICU_PC IMPORTED_TARGET icu-i18n)
@@ -458,23 +458,11 @@ set_target_properties(
SOVERSION ${LIBXML_MAJOR_VERSION}
)

Expand Down Expand Up @@ -56,7 +51,7 @@
endif()

install(FILES ${LIBXML2_HDRS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/libxml2/libxml COMPONENT development)
@@ -577,30 +565,30 @@ endif()
@@ -609,30 +597,30 @@ endif()

configure_package_config_file(
libxml2-config.cmake.cmake.in libxml2-config.cmake
Expand Down Expand Up @@ -92,15 +87,6 @@
NAMESPACE LibXml2::
FILE libxml2-export.cmake
COMPONENT development
--- a/libxml-2.0.pc.in
+++ b/libxml-2.0.pc.in
@@ -8,6 +8,7 @@ Name: libXML
Version: @VERSION@
Description: libXML library version2.
Requires:
-Libs: -L${libdir} @XML_LIBS@
-Libs.private: @XML_PRIVATE_LIBS@ @LIBS@
+Requires.private: @ICU_LIBS@ @Z_LIBS@ @LZMA_LIBS@
+Libs: -L${libdir} -l@XML_LIB_NAME@
+Libs.private: @THREAD_LIBS@ @ICONV_LIBS@ @LIBM@ @WIN32_EXTRA_LIBADD@ @LIBS@
Cflags: @XML_INCLUDEDIR@ @XML_CFLAGS@
--
2.44.0.windows.1

0 comments on commit c4e9372

Please sign in to comment.