Browse Source

Squashed commit of the following:

commit e1ed4e125e8743a6f4d5530bf486ce728c886c84
Author: Aleksandr Kuzmenko <[email protected]>
Date:   Sat Nov 6 22:48:35 2021 +0300

    update compilation flags

commit e742d33b408f63ddac6683f4ac219837b1d3c4bd
Author: Aleksandr Kuzmenko <[email protected]>
Date:   Sat Nov 6 22:25:32 2021 +0300

    fix path

commit f1859536fa8e1ab69cf98970205ed10636c90ab9
Author: Aleksandr Kuzmenko <[email protected]>
Date:   Sat Nov 6 22:02:26 2021 +0300

    [ci] update pcre url
Aleksandr Kuzmenko 3 years ago
parent
commit
62ee6a9a8e
2 changed files with 8 additions and 8 deletions
  1. 4 4
      .github/workflows/main.yml
  2. 4 4
      extra/github-actions/build-mac.yml

+ 4 - 4
.github/workflows/main.yml

@@ -375,7 +375,7 @@ jobs:
         env:
         env:
           ZLIB_VERSION: 1.2.11
           ZLIB_VERSION: 1.2.11
           MBEDTLS_VERSION: 2.25.0
           MBEDTLS_VERSION: 2.25.0
-          PCRE_VERSION: 8.44
+          PCRE_VERSION: 10.39
         run: |
         run: |
           set -ex
           set -ex
           brew uninstall [email protected] || echo
           brew uninstall [email protected] || echo
@@ -395,9 +395,9 @@ jobs:
           curl -L https://github.com/ARMmbed/mbedtls/archive/v$MBEDTLS_VERSION.tar.gz | tar xz
           curl -L https://github.com/ARMmbed/mbedtls/archive/v$MBEDTLS_VERSION.tar.gz | tar xz
           cd mbedtls-$MBEDTLS_VERSION
           cd mbedtls-$MBEDTLS_VERSION
           make && make install
           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
+          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
           make && make install
       
       
       
       

+ 4 - 4
extra/github-actions/build-mac.yml

@@ -2,7 +2,7 @@
   env:
   env:
     ZLIB_VERSION: 1.2.11
     ZLIB_VERSION: 1.2.11
     MBEDTLS_VERSION: 2.25.0
     MBEDTLS_VERSION: 2.25.0
-    PCRE_VERSION: 8.44
+    PCRE_VERSION: 10.39
   run: |
   run: |
     set -ex
     set -ex
     brew uninstall [email protected] || echo
     brew uninstall [email protected] || echo
@@ -22,9 +22,9 @@
     curl -L https://github.com/ARMmbed/mbedtls/archive/v$MBEDTLS_VERSION.tar.gz | tar xz
     curl -L https://github.com/ARMmbed/mbedtls/archive/v$MBEDTLS_VERSION.tar.gz | tar xz
     cd mbedtls-$MBEDTLS_VERSION
     cd mbedtls-$MBEDTLS_VERSION
     make && make install
     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
+    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
     make && make install