Ver Fonte

[mac] fixed compatibility with osx 10.13

Aleksandr Kuzmenko há 4 anos atrás
pai
commit
56bb846c72

+ 22 - 1
.github/workflows/main.yml

@@ -337,6 +337,7 @@ jobs:
     env:
       PLATFORM: mac
       OPAMYES: 1
+      MACOSX_DEPLOYMENT_TARGET: 10.13
     steps:
       - uses: actions/checkout@main
         with:
@@ -371,6 +372,10 @@ jobs:
         run: neko -version 2>&1
       
       - name: Install dependencies
+        env:
+          ZLIB_VERSION: 1.2.11
+          MBEDTLS_VERSION: 2.25.0
+          PCRE_VERSION: 8.44
         run: |
           set -ex
           brew uninstall [email protected] || echo
@@ -383,12 +388,28 @@ jobs:
           brew install cpanminus
           cpanm IPC::System::Simple
           cpanm String::ShellQuote
+          curl -L https://www.zlib.net/zlib-$ZLIB_VERSION.tar.gz | tar xz
+          cd zlib-$ZLIB_VERSION
+          ./configure
+          make && make install
+          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
+          make && make install
+      
       
       - name: Install OCaml libraries
         run: |
           set -ex
           opam init # --disable-sandboxing
           opam update
+          opam switch create 4.07.1
+          eval $(opam env)
+          opam env
+          opam pin add ctypes 0.17.1 --yes
           opam pin add haxe . --no-action
           opam install haxe --deps-only
           opam list
@@ -402,7 +423,7 @@ jobs:
         run: |
           set -ex
           eval $(opam env)
-          opam config exec -- make -s -j`sysctl -n hw.ncpu` STATICLINK=1 "LIB_PARAMS=/usr/local/opt/zlib/lib/libz.a /usr/local/lib/libpcre.a /usr/local/lib/libmbedtls.a /usr/local/lib/libmbedcrypto.a /usr/local/lib/libmbedx509.a -cclib '-mmacosx-version-min=10.13 -framework Security -framework CoreFoundation'" haxe
+          opam config exec -- make -s -j`sysctl -n hw.ncpu` STATICLINK=1 "LIB_PARAMS=/usr/local/lib/libz.a /usr/local/lib/libpcre.a /usr/local/lib/libmbedtls.a /usr/local/lib/libmbedcrypto.a /usr/local/lib/libmbedx509.a -cclib '-framework Security -framework CoreFoundation'" haxe
           opam config exec -- make -s haxelib
           make -s package_unix package_installer_mac
           ls -l out

+ 21 - 1
extra/github-actions/build-mac.yml

@@ -1,4 +1,8 @@
 - name: Install dependencies
+  env:
+    ZLIB_VERSION: 1.2.11
+    MBEDTLS_VERSION: 2.25.0
+    PCRE_VERSION: 8.44
   run: |
     set -ex
     brew uninstall [email protected] || echo
@@ -11,12 +15,28 @@
     brew install cpanminus
     cpanm IPC::System::Simple
     cpanm String::ShellQuote
+    curl -L https://www.zlib.net/zlib-$ZLIB_VERSION.tar.gz | tar xz
+    cd zlib-$ZLIB_VERSION
+    ./configure
+    make && make install
+    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
+    make && make install
+
 
 - name: Install OCaml libraries
   run: |
     set -ex
     opam init # --disable-sandboxing
     opam update
+    opam switch create 4.07.1
+    eval $(opam env)
+    opam env
+    opam pin add ctypes 0.17.1 --yes
     opam pin add haxe . --no-action
     opam install haxe --deps-only
     opam list
@@ -30,7 +50,7 @@
   run: |
     set -ex
     eval $(opam env)
-    opam config exec -- make -s -j`sysctl -n hw.ncpu` STATICLINK=1 "LIB_PARAMS=/usr/local/opt/zlib/lib/libz.a /usr/local/lib/libpcre.a /usr/local/lib/libmbedtls.a /usr/local/lib/libmbedcrypto.a /usr/local/lib/libmbedx509.a -cclib '-mmacosx-version-min=10.13 -framework Security -framework CoreFoundation'" haxe
+    opam config exec -- make -s -j`sysctl -n hw.ncpu` STATICLINK=1 "LIB_PARAMS=/usr/local/lib/libz.a /usr/local/lib/libpcre.a /usr/local/lib/libmbedtls.a /usr/local/lib/libmbedcrypto.a /usr/local/lib/libmbedx509.a -cclib '-framework Security -framework CoreFoundation'" haxe
     opam config exec -- make -s haxelib
     make -s package_unix package_installer_mac
     ls -l out

+ 1 - 0
extra/github-actions/workflows/main.yml

@@ -70,6 +70,7 @@ jobs:
     env:
       PLATFORM: mac
       OPAMYES: 1
+      MACOSX_DEPLOYMENT_TARGET: 10.13
     steps:
       - uses: actions/checkout@main
         with: