Mercurial > mxe-octave

changeset 6919:e2a16310d75c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
texinfo: Depend on PCRE2. * src/texinfo.mk: Depend on PCRE2 instead of PCRE. Adjust condition for that dependency to match conditions in the build rule.
author Markus Mützel <markus.muetzel@gmx.de>
date Sat, 07 Oct 2023 18:20:12 +0200
parents fb442ce4f70d
children 90f4487f92f1
files src/texinfo.mk
diffstat 1 files changed, 5 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/texinfo.mk	Sat Oct 07 17:40:40 2023 +0200
+++ b/src/texinfo.mk	Sat Oct 07 18:20:12 2023 +0200
@@ -10,9 +10,11 @@
 $(PKG)_URL      := ftp://ftp.gnu.org/gnu/texinfo/$($(PKG)_FILE)
 $(PKG)_DEPS     := # libgnurx
 
-ifeq ($(MXE_SYSTEM),mingw)
-    $(PKG)_DEPS += pcre
-    $(PKG)_LIBS += LIBS='-lpcre -lpcreposix -lpthread'
+ifeq ($(MXE_NATIVE_BUILD),yes)
+  ifeq ($(USE_MSYS2),no)
+    $(PKG)_DEPS += pcre2
+    $(PKG)_LIBS += LDFLAGS="`PKG_CONFIG_PATH="$(HOST_LIBDIR)/pkgconfig" $(MXE_PKG_CONFIG) --libs libpcre2-8`"
+  endif
 endif
 
 define $(PKG)_UPDATE