2018-06-09 17:07:04 +00:00
|
|
|
diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt
|
2018-11-04 15:49:51 +00:00
|
|
|
index 4e5292f2a..8c706ea94 100644
|
2018-06-09 17:07:04 +00:00
|
|
|
--- a/code/CMakeLists.txt
|
|
|
|
|
+++ b/code/CMakeLists.txt
|
|
|
|
|
@@ -153,6 +153,17 @@ IF(WITH_STATIC)
|
2018-03-18 09:56:00 +00:00
|
|
|
IF(LIBLZMA_LIBRARIES)
|
|
|
|
|
SET(LIBXML2_LIBRARIES ${LIBXML2_LIBRARIES} ${LIBLZMA_LIBRARIES})
|
|
|
|
|
ENDIF()
|
2018-03-18 10:13:56 +00:00
|
|
|
+ # under Linux, recent libxml2 versions are linked without libicuuc & libicudata
|
2018-03-18 09:56:00 +00:00
|
|
|
+ IF(WITH_STATIC_EXTERNAL)
|
|
|
|
|
+ find_library (LIBICUUC_LIBRARY NAMES icuuc)
|
|
|
|
|
+ IF(LIBICUUC_LIBRARY)
|
|
|
|
|
+ SET(LIBXML2_LIBRARIES ${LIBXML2_LIBRARIES} ${LIBICUUC_LIBRARY})
|
|
|
|
|
+ ENDIF()
|
|
|
|
|
+ find_library (LIBICUDATA_LIBRARY NAMES icudata)
|
|
|
|
|
+ IF(LIBICUDATA_LIBRARY)
|
|
|
|
|
+ SET(LIBXML2_LIBRARIES ${LIBXML2_LIBRARIES} ${LIBICUDATA_LIBRARY})
|
|
|
|
|
+ ENDIF()
|
|
|
|
|
+ ENDIF()
|
|
|
|
|
ENDIF()
|
|
|
|
|
ENDIF()
|
2018-06-09 17:07:04 +00:00
|
|
|
|
2018-11-04 15:49:51 +00:00
|
|
|
diff --git a/patch/libicuuc.patch b/patch/libicuuc.patch
|
|
|
|
|
index 56dc4453d..e69de29bb 100644
|
|
|
|
|
--- a/patch/libicuuc.patch
|
|
|
|
|
+++ b/patch/libicuuc.patch
|
|
|
|
|
@@ -1,22 +0,0 @@
|
|
|
|
|
-diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt
|
|
|
|
|
-index 4e422c0b5..e76be35f1 100644
|
|
|
|
|
---- a/code/CMakeLists.txt
|
|
|
|
|
-+++ b/code/CMakeLists.txt
|
|
|
|
|
-@@ -153,6 +153,17 @@ IF(WITH_STATIC)
|
|
|
|
|
- IF(LIBLZMA_LIBRARIES)
|
|
|
|
|
- SET(LIBXML2_LIBRARIES ${LIBXML2_LIBRARIES} ${LIBLZMA_LIBRARIES})
|
|
|
|
|
- ENDIF()
|
|
|
|
|
-+ # under Linux, recent libxml2 versions are linked without libicuuc & libicudata
|
|
|
|
|
-+ IF(WITH_STATIC_EXTERNAL)
|
|
|
|
|
-+ find_library (LIBICUUC_LIBRARY NAMES icuuc)
|
|
|
|
|
-+ IF(LIBICUUC_LIBRARY)
|
|
|
|
|
-+ SET(LIBXML2_LIBRARIES ${LIBXML2_LIBRARIES} ${LIBICUUC_LIBRARY})
|
|
|
|
|
-+ ENDIF()
|
|
|
|
|
-+ find_library (LIBICUDATA_LIBRARY NAMES icudata)
|
|
|
|
|
-+ IF(LIBICUDATA_LIBRARY)
|
|
|
|
|
-+ SET(LIBXML2_LIBRARIES ${LIBXML2_LIBRARIES} ${LIBICUDATA_LIBRARY})
|
|
|
|
|
-+ ENDIF()
|
|
|
|
|
-+ ENDIF()
|
|
|
|
|
- ENDIF()
|
|
|
|
|
- ENDIF()
|
|
|
|
|
-
|
