From b1cc83b0063a75425606b32abc1c5cd1ee5d1adb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=98rjan=20Malde?= Date: Fri, 16 Jul 2021 14:13:52 +0200 Subject: groups/231.native_packages_etc.group: pcre: bump to v8.45 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ørjan Malde --- groups/231.native_packages_etc.group | 5 +++-- patches/pcre-8.44.local.patch | 11 ----------- patches/pcre-8.45.local.patch | 11 +++++++++++ 3 files changed, 14 insertions(+), 13 deletions(-) delete mode 100644 patches/pcre-8.44.local.patch create mode 100644 patches/pcre-8.45.local.patch diff --git a/groups/231.native_packages_etc.group b/groups/231.native_packages_etc.group index 61215aaa..72044760 100644 --- a/groups/231.native_packages_etc.group +++ b/groups/231.native_packages_etc.group @@ -338,8 +338,9 @@ zstd")"; : ${PKG_P7ZIP_BUILD_STEPS_DISABLE:=install_make}; : ${PKG_P7ZIP_IN_TREE:=1}; : ${PKG_P7ZIP_INSTALL_FILES:="../p7zip-midipix.git/bin/7za=bin/"}; -: ${PKG_PCRE_SHA256SUM:=19108658b23b3ec5058edc9f66ac545ea19f9537234be1ec62b714c84399366d}; -: ${PKG_PCRE_VERSION:=8.44}; +: ${PKG_PCRE_DEPENDS:="bzip2 libz"}; +: ${PKG_PCRE_SHA256SUM:=4dae6fdcd2bb0bb6c37b5f97c33c2be954da743985369cddac3546e3218bffb8}; +: ${PKG_PCRE_VERSION:=8.45}; : ${PKG_PCRE_URL:=https://ftp.pcre.org/pub/pcre/pcre-${PKG_PCRE_VERSION}.tar.bz2}; : ${PKG_PCRE2_DEPENDS:="bzip2 libz"}; : ${PKG_PCRE2_SHA256SUM:=a9ef39278113542968c7c73a31cfcb81aca1faa64690f400b907e8ab6b4a665c}; diff --git a/patches/pcre-8.44.local.patch b/patches/pcre-8.44.local.patch deleted file mode 100644 index babbfce9..00000000 --- a/patches/pcre-8.44.local.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- pcre-8.42/Makefile.in.orig 2018-03-20 10:53:18.000000000 +0000 -+++ pcre-8.42/Makefile.in 2018-08-21 20:20:32.800000000 +0000 -@@ -1081,7 +1081,7 @@ - # it is generated from pcre.h.in. - nodist_include_HEADERS = pcre.h $(am__append_1) - include_HEADERS = pcreposix.h $(am__append_2) --bin_SCRIPTS = pcre-config -+bin_SCRIPTS = - @WITH_REBUILD_CHARTABLES_TRUE@dftables_SOURCES = dftables.c - BUILT_SOURCES = pcre_chartables.c - @WITH_PCRE8_TRUE@libpcre_la_SOURCES = \ diff --git a/patches/pcre-8.45.local.patch b/patches/pcre-8.45.local.patch new file mode 100644 index 00000000..babbfce9 --- /dev/null +++ b/patches/pcre-8.45.local.patch @@ -0,0 +1,11 @@ +--- pcre-8.42/Makefile.in.orig 2018-03-20 10:53:18.000000000 +0000 ++++ pcre-8.42/Makefile.in 2018-08-21 20:20:32.800000000 +0000 +@@ -1081,7 +1081,7 @@ + # it is generated from pcre.h.in. + nodist_include_HEADERS = pcre.h $(am__append_1) + include_HEADERS = pcreposix.h $(am__append_2) +-bin_SCRIPTS = pcre-config ++bin_SCRIPTS = + @WITH_REBUILD_CHARTABLES_TRUE@dftables_SOURCES = dftables.c + BUILT_SOURCES = pcre_chartables.c + @WITH_PCRE8_TRUE@libpcre_la_SOURCES = \ -- cgit v1.2.3