[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [lmi] master b21f123 01/14: Don't link ws2_32 lib for nati
From: |
Greg Chicares |
Subject: |
[lmi-commits] [lmi] master b21f123 01/14: Don't link ws2_32 lib for native Linux build of XML libraries |
Date: |
Sat, 10 Oct 2020 11:07:10 -0400 (EDT) |
branch: master
commit b21f1237aa9cab52f33cf7e66aa8b9370837065b
Author: Ilya Sinitsyn <isinitsyn@tt-solutions.com>
Commit: Gregory W. Chicares <gchicares@sbcglobal.net>
Don't link ws2_32 lib for native Linux build of XML libraries
---
install_xml_libraries.sh | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/install_xml_libraries.sh b/install_xml_libraries.sh
index cc50ac0..94306eb 100755
--- a/install_xml_libraries.sh
+++ b/install_xml_libraries.sh
@@ -96,6 +96,13 @@ xmlsoft_common_cflags=$(echo '
-Wno-unused-variable
' | tr '\n' ' ' | tr -s ' ' )
+xmlsoft_common_ldflags=""
+case "$LMI_TRIPLET" in
+ *-*-cygwin*|*-*-mingw*)
+ xmlsoft_common_ldflags="$xmlsoft_common_ldflags -lws2_32"
+ ;;
+esac
+
third_party_libraries_common_options="
--prefix=$prefix
--exec-prefix=$exec_prefix
@@ -183,7 +190,7 @@ for lib in libxml2 libxslt; do
# 'configure' options must not be double-quoted
# shellcheck disable=SC2046
"$libdir/configure" \
- LDFLAGS='-lws2_32' \
+ LDFLAGS="$xmlsoft_common_ldflags" \
CPPFLAGS='-w' \
CFLAGS="-g -O2 $xmlsoft_common_cflags" \
$(eval "echo \$${lib}_options")
- [lmi-commits] [lmi] master updated (866ff71 -> b615b7b), Greg Chicares, 2020/10/10
- [lmi-commits] [lmi] master a6df4f8 04/14: Don't use Wine for the native Linux build, Greg Chicares, 2020/10/10
- [lmi-commits] [lmi] master 44e80a2 03/14: Supress Boost.Regex compilation warning, Greg Chicares, 2020/10/10
- [lmi-commits] [lmi] master b21f123 01/14: Don't link ws2_32 lib for native Linux build of XML libraries,
Greg Chicares <=
- [lmi-commits] [lmi] master faa2234 09/14: Improve GitHub CI tests build speed, Greg Chicares, 2020/10/10
- [lmi-commits] [lmi] master 711d483 10/14: Disable lmi building with SO attributes for the native CI build, Greg Chicares, 2020/10/10
- [lmi-commits] [lmi] master 10256f5 05/14: Use set_toolchain.sh in the coding rules test script, Greg Chicares, 2020/10/10
- [lmi-commits] [lmi] master 628d547 07/14: Fix lmi building step in GitHub CI workflow, Greg Chicares, 2020/10/10
- [lmi-commits] [lmi] master deabd16 08/14: Add native Linux build variant to GitHub CI workflows, Greg Chicares, 2020/10/10
- [lmi-commits] [lmi] master b615b7b 14/14: fixup! Set PATH and LD_LIBRARY_PATH in the GitHub CI workflow, Greg Chicares, 2020/10/10
- [lmi-commits] [lmi] master 6164366 02/14: Fix configuring wxPdfDoc under Linux, Greg Chicares, 2020/10/10
- [lmi-commits] [lmi] master bf80fc8 11/14: Use env instead of set for the native Linux build, Greg Chicares, 2020/10/10
- [lmi-commits] [lmi] master 86ba7a9 13/14: Set PATH and LD_LIBRARY_PATH in the GitHub CI workflow, Greg Chicares, 2020/10/10
- [lmi-commits] [lmi] master 1ef40dd 06/14: Handle the exit code to avoid the unused result compilation warning, Greg Chicares, 2020/10/10