Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history
commit e1ed4e1
Author: Aleksandr Kuzmenko <alex@stablex.ru>
Date:   Sat Nov 6 22:48:35 2021 +0300

    update compilation flags

commit e742d33
Author: Aleksandr Kuzmenko <alex@stablex.ru>
Date:   Sat Nov 6 22:25:32 2021 +0300

    fix path

commit f185953
Author: Aleksandr Kuzmenko <alex@stablex.ru>
Date:   Sat Nov 6 22:02:26 2021 +0300

    [ci] update pcre url
  • Loading branch information
RealyUniqueName committed Nov 6, 2021
1 parent b159a63 commit 62ee6a9
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -375,7 +375,7 @@ jobs:
env:
ZLIB_VERSION: 1.2.11
MBEDTLS_VERSION: 2.25.0
PCRE_VERSION: 8.44
PCRE_VERSION: 10.39
run: |
set -ex
brew uninstall openssl@1.0.2t || echo
Expand All @@ -395,9 +395,9 @@ jobs:
curl -L https://github.com/ARMmbed/mbedtls/archive/v$MBEDTLS_VERSION.tar.gz | tar xz
cd mbedtls-$MBEDTLS_VERSION
make && make install
curl -L https://ftp.pcre.org/pub/pcre/pcre-$PCRE_VERSION.tar.gz | tar xz
cd pcre-$PCRE_VERSION
./configure --enable-utf8 --enable-pcre8 --enable-pcre16 --enable-pcre32 --enable-unicode-properties --enable-pcregrep-libz --enable-pcregrep-libbz2 --enable-jit
curl -L https://github.com/PhilipHazel/pcre2/releases/download/pcre2-10.39/pcre2-$PCRE_VERSION.tar.gz | tar xz

This comment has been minimized.

Copy link
@Uzume

Uzume May 14, 2022

@RealyUniqueName This clearly introduces a bug since you are using PCRE_VERSION for the version number in the filename but then hard coding 10.39 earlier in the path. That said, I do not think we should be building PCRE or PCRE2 at all. All the build instructions specify installing system packages and in the macos case to use brew, see extra/BUILDING.md#installing-dependencies (not to mention haxe is built with ocaml and currently depends on the opam package conf-libpcre which also specifies using pcre from homebrew).

cd pcre2-$PCRE_VERSION
./configure --enable-utf8 --enable-pcre2-8 --enable-pcre2-16 --enable-pcre2-32 --enable-unicode-properties --enable-pcregrep-libz --enable-pcregrep-libbz2 --enable-jit
make && make install

Expand Down
8 changes: 4 additions & 4 deletions extra/github-actions/build-mac.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
env:
ZLIB_VERSION: 1.2.11
MBEDTLS_VERSION: 2.25.0
PCRE_VERSION: 8.44
PCRE_VERSION: 10.39
run: |
set -ex
brew uninstall openssl@1.0.2t || echo
Expand All @@ -22,9 +22,9 @@
curl -L https://github.com/ARMmbed/mbedtls/archive/v$MBEDTLS_VERSION.tar.gz | tar xz
cd mbedtls-$MBEDTLS_VERSION
make && make install
curl -L https://ftp.pcre.org/pub/pcre/pcre-$PCRE_VERSION.tar.gz | tar xz
cd pcre-$PCRE_VERSION
./configure --enable-utf8 --enable-pcre8 --enable-pcre16 --enable-pcre32 --enable-unicode-properties --enable-pcregrep-libz --enable-pcregrep-libbz2 --enable-jit
curl -L https://github.com/PhilipHazel/pcre2/releases/download/pcre2-10.39/pcre2-$PCRE_VERSION.tar.gz | tar xz

This comment has been minimized.

Copy link
@Uzume

Uzume May 14, 2022

@RealyUniqueName This clearly introduces a bug since you are using PCRE_VERSION for the version number in the filename but then hard coding 10.39 earlier in the path. That said, I do not think we should be building PCRE or PCRE2 at all. All the build instructions specify installing system packages and in the macos case to use brew, see extra/BUILDING.md#installing-dependencies (not to mention haxe is built with ocaml and currently depends on the opam package conf-libpcre which also specifies using pcre from homebrew).

cd pcre2-$PCRE_VERSION
./configure --enable-utf8 --enable-pcre2-8 --enable-pcre2-16 --enable-pcre2-32 --enable-unicode-properties --enable-pcregrep-libz --enable-pcregrep-libbz2 --enable-jit
make && make install
Expand Down

0 comments on commit 62ee6a9

Please sign in to comment.