Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[PCRE2] Update to v10.40 #4924

Merged
merged 1 commit into from
May 20, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 4 additions & 12 deletions P/PCRE2/build_tarballs.jl
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,12 @@
using BinaryBuilder

name = "PCRE2"
version = v"10.36"
version = v"10.40"

# Collection of sources required to complete build
sources = [
ArchiveSource("https://github.com/PhilipHazel/pcre2/archive/refs/tags/pcre2-$(version.major).$(version.minor).tar.gz",
"4975181fa486a595fc2de1ebce85793412d631e0ac006a7906f854caf62c9745"),
DirectorySource("./bundled"),
ArchiveSource("https://github.com/PCRE2Project/pcre2/releases/download/pcre2-$(version.major).$(version.minor)/pcre2-$(version.major).$(version.minor).tar.gz",
"ded42661cab30ada2e72ebff9e725e745b4b16ce831993635136f2ef86177724"),
]

# Bash recipe for building across all platforms
Expand All @@ -19,16 +18,9 @@ cd $WORKSPACE/srcdir/pcre2-*/
# Update configure scripts
update_configure_scripts

# NOTE: this step may be removed if we switch to release tarballs in the future.
./autogen.sh

# Force optimization
export CFLAGS="${CFLAGS} -O3"

# Apply patches
atomic_patch -d src/sljit -p2 ${WORKSPACE}/srcdir/patches/sljit-apple-silicon-support.patch
atomic_patch -d src/sljit -p2 ${WORKSPACE}/srcdir/patches/sljit-nomprotect.patch

./configure --prefix=${prefix} --build=${MACHTYPE} --host=${target} \
--disable-static \
--enable-jit \
Expand Down Expand Up @@ -61,4 +53,4 @@ products = [
dependencies = Dependency[
]

build_tarballs(ARGS, name, version, sources, script, platforms, products, dependencies; julia_compat="1.6")
build_tarballs(ARGS, name, version, sources, script, platforms, products, dependencies; julia_compat="1.9")
244 changes: 0 additions & 244 deletions P/PCRE2/bundled/patches/sljit-apple-silicon-support.patch

This file was deleted.

17 changes: 0 additions & 17 deletions P/PCRE2/bundled/patches/sljit-nomprotect.patch

This file was deleted.