Skip to content

Commit

Permalink
synocli-file: try to fix build of ripgrep (#6050)
Browse files Browse the repository at this point in the history
* fix ripgrep builds within spk/syncli-file
- remove to force static pcre2-sys for ripgrep (was PCRE2_SYS_STATIC=1 and CARGO_BUILD_ARGS += --features 'pcre2')

* update pcre2 from v10.42 to v10.43

finally both changes are optional to fix the build (i.e. the build succeeded and the former error cause is unknown).
  • Loading branch information
hgy59 authored Mar 29, 2024
1 parent 91ed4c4 commit 184e776
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 13 deletions.
2 changes: 1 addition & 1 deletion cross/pcre2/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PKG_NAME = pcre2
PKG_VERS = 10.42
PKG_VERS = 10.43
PKG_EXT = tar.bz2
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
PKG_DIST_SITE = https://github.com/PhilipHazel/pcre2/releases/download/$(PKG_NAME)-$(PKG_VERS)
Expand Down
6 changes: 3 additions & 3 deletions cross/pcre2/PLIST
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ bin:bin/pcre2grep
bin:bin/pcre2test
lnk:lib/libpcre2-32.so
lnk:lib/libpcre2-32.so.0
lib:lib/libpcre2-32.so.0.11.2
lib:lib/libpcre2-32.so.0.12.0
lnk:lib/libpcre2-8.so
lnk:lib/libpcre2-8.so.0
lib:lib/libpcre2-8.so.0.11.2
lib:lib/libpcre2-8.so.0.12.0
lnk:lib/libpcre2-posix.so
lnk:lib/libpcre2-posix.so.3
lib:lib/libpcre2-posix.so.3.0.4
lib:lib/libpcre2-posix.so.3.0.5
6 changes: 3 additions & 3 deletions cross/pcre2/digests
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
pcre2-10.42.tar.bz2 SHA1 9876f2165ed6ee38d1853a8e2eaafdfbcb291b76
pcre2-10.42.tar.bz2 SHA256 8d36cd8cb6ea2a4c2bb358ff6411b0c788633a2a45dabbf1aeb4b701d1b5e840
pcre2-10.42.tar.bz2 MD5 a8e9ab2935d428a4807461f183034abe
pcre2-10.43.tar.bz2 SHA1 300aede670b6c514e7edcd0d603e586ea66f1ee6
pcre2-10.43.tar.bz2 SHA256 e2a53984ff0b07dfdb5ae4486bbb9b21cca8e7df2434096cc9bf1b728c350bcb
pcre2-10.43.tar.bz2 MD5 c8e2043cbc4abb80e76dba323f7c409f
4 changes: 0 additions & 4 deletions cross/ripgrep/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,6 @@ HOMEPAGE = https://github.com/BurntSushi/ripgrep
COMMENT = ripgrep recursively searches directories for a regex pattern.
LICENSE = public domain/Unlicense

# Force static build when pcre2 is detected in synocli-file build environment
ENV += PCRE2_SYS_STATIC=1
CARGO_BUILD_ARGS += --features 'pcre2'

include ../../mk/spksrc.common.mk
ifeq ($(call version_le, $(TC_GCC), 5.0),1)
# upstream/src/pcre2_script_run.c - error: .... only allowed in C99 or C11 mode
Expand Down
6 changes: 4 additions & 2 deletions diyspk/ripgrep/Makefile
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
SPK_NAME = ripgrep
SPK_VERS = 13.0.0
SPK_VERS = 14.1.0
SPK_REV = 1
SPK_ICON = src/ripgrep.png

DEPENDS = cross/$(SPK_NAME)
# simulate existance of pcre2
DEPENDS = cross/pcre2
DEPENDS += cross/ripgrep

# powerpc archs (except qoriq) are not supported
UNSUPPORTED_ARCHS += $(OLD_PPC_ARCHS)
Expand Down

0 comments on commit 184e776

Please sign in to comment.