blob: a5cb9730e44490b0c0de596a5fd01f7dc29d170f (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
|
From 95fe8463a3283f0f2c72fcf3416ebfac095688e5 Mon Sep 17 00:00:00 2001
From: Alexey Abramov <levenson@mmer.org>
Date: Sun, 9 Feb 2020 18:31:26 +0100
Subject: [PATCH] Check <xlocale.h> header file
Few libraries use hard-coded xlocale_h header even though if CMake takes care
of it properly. Remove defined headers, and rely on CMake preprocessor
instead.
---
.../src/main/native/Source/ThirdParty/libxslt/linux/config.h | 2 +-
.../src/main/native/Source/ThirdParty/libxslt/src/config.h.in | 2 +-
modules/web/src/main/native/Source/cmake/OptionsCommon.cmake | 1 +
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/modules/web/src/main/native/Source/ThirdParty/libxslt/linux/config.h b/modules/web/src/main/native/Source/ThirdParty/libxslt/linux/config.h
index bd44c163..b19b45f4 100644
--- a/modules/web/src/main/native/Source/ThirdParty/libxslt/linux/config.h
+++ b/modules/web/src/main/native/Source/ThirdParty/libxslt/linux/config.h
@@ -143,7 +143,7 @@
#define HAVE_VSPRINTF 1
/* Define to 1 if you have the <xlocale.h> header file. */
-#define HAVE_XLOCALE_H 1
+/* #define HAVE_XLOCALE_H 1 */
/* Define to 1 if you have the `_stat' function. */
/* #undef HAVE__STAT */
diff --git a/modules/web/src/main/native/Source/ThirdParty/libxslt/src/config.h.in b/modules/web/src/main/native/Source/ThirdParty/libxslt/src/config.h.in
index 085354e9..0210fce2 100644
--- a/modules/web/src/main/native/Source/ThirdParty/libxslt/src/config.h.in
+++ b/modules/web/src/main/native/Source/ThirdParty/libxslt/src/config.h.in
@@ -142,7 +142,7 @@
#undef HAVE_VSPRINTF
/* Define to 1 if you have the <xlocale.h> header file. */
-#undef HAVE_XLOCALE_H
+/* #undef HAVE_XLOCALE_H */
/* Define to 1 if you have the `_stat' function. */
#undef HAVE__STAT
diff --git a/modules/web/src/main/native/Source/cmake/OptionsCommon.cmake b/modules/web/src/main/native/Source/cmake/OptionsCommon.cmake
index 3bbd2c4a..2b618dd6 100644
--- a/modules/web/src/main/native/Source/cmake/OptionsCommon.cmake
+++ b/modules/web/src/main/native/Source/cmake/OptionsCommon.cmake
@@ -148,6 +148,7 @@ _HAVE_CHECK_INCLUDE(HAVE_STRINGS_H strings.h)
_HAVE_CHECK_INCLUDE(HAVE_SYS_PARAM_H sys/param.h)
_HAVE_CHECK_INCLUDE(HAVE_SYS_TIME_H sys/time.h)
_HAVE_CHECK_INCLUDE(HAVE_SYS_TIMEB_H sys/timeb.h)
+_HAVE_CHECK_INCLUDE(HAVE_XLOCALE_H xlocale.h)
# Check for functions
_HAVE_CHECK_FUNCTION(HAVE_ALIGNED_MALLOC _aligned_malloc)
--
2.24.1
|
