[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [lmi] master da6b758 1/7: Make PCRE available, for pc-linu
From: |
Greg Chicares |
Subject: |
[lmi-commits] [lmi] master da6b758 1/7: Make PCRE available, for pc-linux-gnu only |
Date: |
Sat, 2 Oct 2021 17:56:48 -0400 (EDT) |
branch: master
commit da6b758f56dbfc46c1d295237964bfc5a8af82ac
Author: Gregory W. Chicares <gchicares@sbcglobal.net>
Commit: Gregory W. Chicares <gchicares@sbcglobal.net>
Make PCRE available, for pc-linux-gnu only
The plan is to use PCRE only for 'test_coding_rules' (restricting that
to pc-linux-gnu only), and incidentally for a regex unit test. It's not
worth the trouble to make PCRE work for msw.
---
.github/workflows/ci.yml | 2 +-
configure.ac | 7 +++++++
lmi_setup_20.sh | 1 +
3 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index de749f5..1fa238c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -84,7 +84,7 @@ jobs:
packages="$packages wine32"
else
- packages="$packages libunwind-dev libdw-dev libgtk-3-dev"
+ packages="$packages libunwind-dev libdw-dev libpcre2-dev
libgtk-3-dev"
fi
if [ "${{ matrix.compiler }}" = clang ]; then
diff --git a/configure.ac b/configure.ac
index acd94f5..9d942f0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -511,6 +511,13 @@ AC_TRY_COMPILE([#include <xmlwrapp/xmlwrapp.h>],
CXXFLAGS=$save_CXXFLAGS
LIBS=$save_LIBS
+dnl --- libpcre2-8 is used by test_coding_rules which is only built under Linux
+if test "$USE_LINUX" = "1"; then
+ PKG_CHECK_MODULES(PCRE2, libpcre2-8)
+ AC_SUBST(PCRE2_CFLAGS)
+ AC_SUBST(PCRE2_LIBS)
+fi
+
dnl --- libunwind and libdw, only used under Linux and only with gcc/libstdc++
if test "$USE_LINUX" = "1" -a "$CLANG" != "yes"; then
PKG_CHECK_MODULES(UNWIND, libunwind libdw)
diff --git a/lmi_setup_20.sh b/lmi_setup_20.sh
index 124b058..38df8f9 100755
--- a/lmi_setup_20.sh
+++ b/lmi_setup_20.sh
@@ -96,6 +96,7 @@ apt-get --assume-yes install \
libc6-dbg \
libdw-dev \
libgtk-3-dev \
+ libpcre2-dev \
libtool \
libxml2-utils \
libunwind-dev \
- [lmi-commits] [lmi] master updated (d2dd934 -> 368ee55), Greg Chicares, 2021/10/02
- [lmi-commits] [lmi] master da6b758 1/7: Make PCRE available, for pc-linux-gnu only,
Greg Chicares <=
- [lmi-commits] [lmi] master c40b1c2 4/7: Unit-test PCRE (pc-linux-gnu only) as well as std::regex, Greg Chicares, 2021/10/02
- [lmi-commits] [lmi] master 11464e0 6/7: Use PCRE for 'test_coding_rules', Greg Chicares, 2021/10/02
- [lmi-commits] [lmi] master bcfffdd 5/7: Use an ELF 'test_coding_rules' regardless of $LMI_TRIPLET, Greg Chicares, 2021/10/02
- [lmi-commits] [lmi] master b87c2d5 2/7: Add C++ wrapper for PCRE2, Greg Chicares, 2021/10/02
- [lmi-commits] [lmi] master a167c11 3/7: Unit-test std::regex instead of boost::regex, Greg Chicares, 2021/10/02
- [lmi-commits] [lmi] master 368ee55 7/7: Eradicate the boost regex library, Greg Chicares, 2021/10/02