Skip to content

Commit

Permalink
Changes:
Browse files Browse the repository at this point in the history
 - use libpcre2 instead of libpcre
 - patch Src/Modules/pcre.c: source from mainstream's git (23.9.2023)
 - patch configure.ac and config.h.in: replace libpcre with libpcre2 and remove missing AC_PROG_LN
 - patch Src/Makefile.in: use LN_S instead of LN
 - patch Test/V07pcre.ztst: add some libpcre2 specific tests
 - use configure.ac instead of traditional configure: git version no longer supports traditional configure script, so it was easier to backport configure.ac for libpcre2

Auto-tools was missing AC_PROG_LN, configure.ac and Makefile.in patched to use AC_PROG_LN_S instead.

PKG_FIXUP:=autoreconf sets configure.ac used over traditional configure script.

Patches are split to 2.
010-use-libpcre2.patch replaces libpcre with libpcre2.
020-replace-missing-autotools-ln-with-ln_s.patch fixes autotools configure and install scripts so they are compatible with openwrt build system.

changes to replace libpcre with libpcre2 are based on
backporting of zsh-users/zsh@b4d1c756 pcre2 code.

Remarks:
Patch replacing libpcre with libpcre2 becomes obsolete when zsh is released next time.
It should then be removed.

Signed-off-by: Oskari Rauta <[email protected]>
  • Loading branch information
oskarirauta committed Sep 29, 2023
1 parent f54718b commit 762403e
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 0 deletions.
9 changes: 9 additions & 0 deletions utils/zsh/patches/010-use-libpcre2.patch
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
This patch updates pcre module to use pcre2 instead of old pcre.
It patches module to match with zsh-users/zsh@b4d1c756
Patch also updates build scripts to match with same version
on the parts of pcre related parts to allow it to be built.

This patch becomes obsolete on next release of zsh which
will contain all these changes directly from mainstream.

Signed-off-by: Oskari Rauta <[email protected]>
--- a/Src/Modules/pcre.c
+++ b/Src/Modules/pcre.c
@@ -34,11 +34,11 @@
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
Work-around to get past with missing @LN@ macro which
is missing from openwrt's autotools. Can be removed
if it is one day fixed in build tools.

Signed-off-by: Oskari Rauta <[email protected]>
--- a/Src/Makefile.in
+++ b/Src/Makefile.in
@@ -35,7 +35,7 @@ VPATH = @srcdir@
Expand Down

0 comments on commit 762403e

Please sign in to comment.