[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [lmi] master 6164366 02/14: Fix configuring wxPdfDoc under
From: |
Greg Chicares |
Subject: |
[lmi-commits] [lmi] master 6164366 02/14: Fix configuring wxPdfDoc under Linux |
Date: |
Sat, 10 Oct 2020 11:07:11 -0400 (EDT) |
branch: master
commit 6164366999d76baa22712a02a45730c56c96aa36
Author: Ilya Sinitsyn <isinitsyn@tt-solutions.com>
Commit: Gregory W. Chicares <gchicares@sbcglobal.net>
Fix configuring wxPdfDoc under Linux
Don't pass host and build parameters to wxWidgets configure script when
not cross-compiling, this is unnecessary and can actually be harmful as
it exposes some latent bugs in wx-config.
---
install_wxpdfdoc.sh | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/install_wxpdfdoc.sh b/install_wxpdfdoc.sh
index c3a11a0..9befa92 100755
--- a/install_wxpdfdoc.sh
+++ b/install_wxpdfdoc.sh
@@ -62,11 +62,19 @@ config_options="
--exec-prefix=$exec_prefix
--with-wx-prefix=$prefix
--with-wx-exec-prefix=$exec_prefix
- --build=$build_type
- --host=$LMI_TRIPLET
--disable-dependency-tracking
"
+# Provide the host and the build type only when cross-compiling.
+if [ "$LMI_TRIPLET" != "$build_type" ]
+then
+ config_options="
+ $config_options
+ --build=$build_type
+ --host=$LMI_TRIPLET
+ "
+fi
+
[ -n "$mingw_bin_dir" ] && export PATH="$mingw_bin_dir:${PATH}"
cd "$wxpdfdoc_dir"
- [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, 2020/10/10
- [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 <=
- [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
- [lmi-commits] [lmi] master 4485a27 12/14: Remove the warning message for the native Linux build, Greg Chicares, 2020/10/10