diff options
| author | Hirokazu MORIKAWA <morikw2@gmail.com> | 2023-09-22 10:36:43 +0900 |
|---|---|---|
| committer | Josef Schlehofer <pepe.schlehofer@gmail.com> | 2023-10-06 11:04:31 +0200 |
| commit | 95ed7fcc7b23d4ba854a729d4e692132eba78feb (patch) | |
| tree | 6174de6c3f8b081c3ab2f9a9042eff78173d2d49 | |
| parent | b211715d47955767c854fac01482803946fe5bda (diff) | |
mg: switch pcre to pcre2
Switch pcre to pcre2
https://github.com/openwrt/packages/issues/22006
Signed-off-by: Hirokazu MORIKAWA <morikw2@gmail.com>
(cherry picked from commit 3d11e5c197e250f0a32ca813ff07d480b59311d0)
| -rw-r--r-- | utils/mg/Makefile | 4 | ||||
| -rw-r--r-- | utils/mg/patches/001-cross_compile_openwrt.patch | 2 | ||||
| -rw-r--r-- | utils/mg/patches/901-use_pcre.patch | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/utils/mg/Makefile b/utils/mg/Makefile index d310acff8..5c8e18b81 100644 --- a/utils/mg/Makefile +++ b/utils/mg/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mg PKG_VERSION:=7.3 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/ibara/mg/tar.gz/$(PKG_NAME)-$(PKG_VERSION)? @@ -22,7 +22,7 @@ include $(INCLUDE_DIR)/package.mk define Package/mg SECTION:=utils CATEGORY:=Utilities - DEPENDS:=+libncurses +libpcre + DEPENDS:=+libncurses +libpcre2 TITLE:=microscopic EMACS style editor URL:=https://github.com/ibara/mg SUBMENU:=Editors diff --git a/utils/mg/patches/001-cross_compile_openwrt.patch b/utils/mg/patches/001-cross_compile_openwrt.patch index 4216294a4..3504eaac3 100644 --- a/utils/mg/patches/001-cross_compile_openwrt.patch +++ b/utils/mg/patches/001-cross_compile_openwrt.patch @@ -168,7 +168,7 @@ - ;; -esac +# OpenWrt -+libs='-lncurses -lpcreposix -lutil' ++libs='-lncurses -lpcre2-posix -lutil' +cflags="$cflags -D_GNU_SOURCE -D__dead=\"__attribute__((__noreturn__))\" -Dst_mtimespec=st_mtim" cat << EOF > config.h diff --git a/utils/mg/patches/901-use_pcre.patch b/utils/mg/patches/901-use_pcre.patch index 292f2eba7..4ae230a6b 100644 --- a/utils/mg/patches/901-use_pcre.patch +++ b/utils/mg/patches/901-use_pcre.patch @@ -5,7 +5,7 @@ #include <sys/queue.h> #include <sys/types.h> -#include <regex.h> -+#include <pcreposix.h> ++#include <pcre2posix.h> #include <signal.h> #include <stdio.h> #include <string.h> |