mononoke/integration: build EdenSCM with getdeps provided OpenSSL

The OpenSSL version on Mac doesn't work well with EdenSCM and Mononoke
integration, just use the one from getdeps.

.github/workflows/eden_scm_lib_edenapi_tools_mac.yml

@@ -13,8 +13,6 @@ on:
 jobs:
   build:
     runs-on: macOS-latest
-    env:
-      DEVELOPER_DIR: /Applications/Xcode_10.3.app/Contents/Developer
     steps:
     - uses: actions/checkout@v1
     - name: Install Rust Stable

.github/workflows/edenscm_mac.yml

@@ -13,8 +13,6 @@ on:
 jobs:
   build:
     runs-on: macOS-latest
-    env:
-      DEVELOPER_DIR: /Applications/Xcode_10.3.app/Contents/Developer
     steps:
     - uses: actions/checkout@v1
     - name: Install Rust Stable

.github/workflows/mononoke-integration_mac.yml

@@ -11,8 +11,6 @@ on:
 jobs:
   tests:
     runs-on: macOS-latest
-    env:
-      DEVELOPER_DIR: /Applications/Xcode_10.3.app/Contents/Developer
     steps:
     - uses: actions/checkout@v1
     - name: Check space
@@ -38,6 +36,9 @@ jobs:
       run: sudo python3 build/fbcode_builder/getdeps.py --allow-system-packages install-system-deps --recursive eden_scm
     - name: Build eden_scm dependencies
       run: >-
+        export PATH="/usr/local/opt/curl-openssl/bin:$PATH";
+        export LDFLAGS="-L/usr/local/opt/curl-openssl/lib";
+        export CPPFLAGS="-I/usr/local/opt/curl-openssl/include";
         python3 build/fbcode_builder/getdeps.py build
         --allow-system-packages
         --scratch-path /tmp/build
@@ -46,6 +47,9 @@ jobs:
         eden_scm
     - name: Build eden_scm
       run: >-
+        export PATH="/usr/local/opt/curl-openssl/bin:$PATH";
+        export LDFLAGS="-L/usr/local/opt/curl-openssl/lib";
+        export CPPFLAGS="-I/usr/local/opt/curl-openssl/include";
         python3 build/fbcode_builder/getdeps.py build
         --allow-system-packages
         --scratch-path /tmp/build
@@ -54,6 +58,9 @@ jobs:
         eden_scm
     - name: Build eden_scm_lib_edenapi_tools
       run: >-
+        export PATH="/usr/local/opt/curl-openssl/bin:$PATH";
+        export LDFLAGS="-L/usr/local/opt/curl-openssl/lib";
+        export CPPFLAGS="-I/usr/local/opt/curl-openssl/include";
         python3 build/fbcode_builder/getdeps.py build
         --allow-system-packages
         --scratch-path /tmp/build
@@ -62,6 +69,9 @@ jobs:
         eden_scm_lib_edenapi_tools
     - name: Build mononoke dependencies
       run: >-
+        export PATH="/usr/local/opt/curl-openssl/bin:$PATH";
+        export LDFLAGS="-L/usr/local/opt/curl-openssl/lib";
+        export CPPFLAGS="-I/usr/local/opt/curl-openssl/include";
         python3 build/fbcode_builder/getdeps.py build
         --allow-system-packages
         --scratch-path /tmp/build
@@ -70,6 +80,9 @@ jobs:
         mononoke
     - name: Build mononoke
       run: >-
+        export PATH="/usr/local/opt/curl-openssl/bin:$PATH";
+        export LDFLAGS="-L/usr/local/opt/curl-openssl/lib";
+        export CPPFLAGS="-I/usr/local/opt/curl-openssl/include";
         python3 build/fbcode_builder/getdeps.py build
         --allow-system-packages
         --scratch-path /tmp/build
@@ -89,6 +102,8 @@ jobs:
     - name: Run Monononke integration tests
       run: >-
         export PATH="/usr/local/opt/curl-openssl/bin:$PATH";
+        export LDFLAGS="-L/usr/local/opt/curl-openssl/lib";
+        export CPPFLAGS="-I/usr/local/opt/curl-openssl/include";
         PYTHONPATH="$PYTHONPATH:/opt/hostedtoolcache/Python/2.7.18/x64/lib/python2.7/site-packages"
         python3
         eden/mononoke/tests/integration/run_tests_getdeps.py
@@ -99,6 +114,8 @@ jobs:
       run: >-
         cat eden/mononoke/tests/integration/.test* || true;
         export PATH="/usr/local/opt/curl-openssl/bin:$PATH";
+        export LDFLAGS="-L/usr/local/opt/curl-openssl/lib";
+        export CPPFLAGS="-I/usr/local/opt/curl-openssl/include";
         PYTHONPATH="$PYTHONPATH:/opt/hostedtoolcache/Python/2.7.18/x64/lib/python2.7/site-packages"
         python3
         eden/mononoke/tests/integration/run_tests_getdeps.py

.github/workflows/mononoke_mac.yml

@@ -11,8 +11,6 @@ on:
 jobs:
   build:
     runs-on: macOS-latest
-    env:
-      DEVELOPER_DIR: /Applications/Xcode_10.3.app/Contents/Developer
     steps:
     - uses: actions/checkout@v1
     - name: Check space

build/fbcode_builder/getdeps/buildopts.py

@@ -269,12 +269,10 @@ def compute_env_for_install_dirs(self, install_dirs, env=None, manifest=None):
                 env["RUSTC"] = rustc_path
                 env["RUSTDOC"] = rustdoc_path
 
-            if self.is_windows():
-                libcrypto = os.path.join(d, "lib/libcrypto.lib")
-            else:
-                libcrypto = os.path.join(d, "lib/libcrypto.so")
             openssl_include = os.path.join(d, "include/openssl")
-            if os.path.isfile(libcrypto) and os.path.isdir(openssl_include):
+            if os.path.isdir(openssl_include) and any(
+                os.path.isfile(os.path.join(d, "lib", libcrypto))
+                for libcrypto in ("libcrypto.lib", "libcrypto.so", "libcrypto.a")):
                 # This must be the openssl library, let Rust know about it
                 env["OPENSSL_DIR"] = d
 

eden/scm/Makefile

@@ -108,6 +108,8 @@ getdepsbuild:
 	mkdir -p ../../common/rust
 	ln -sfn $(GETDEPS_INSTALL_DIR)/rust-shed/source/shed ../../common/rust/shed
 	GETDEPS_BUILD=1 \
+		INCLUDE_DIRS="$(OPENSSL_DIR)/include:/usr/local/include:/opt/local/include:/opt/homebrew/include/" \
+		LIBRARY_DIRS="$(OPENSSL_DIR)/lib:/usr/local/lib:/opt/local/lib:/opt/homebrew/lib/" \
 		THRIFT="$(GETDEPS_INSTALL_DIR)/fbthrift/bin/thrift1" \
 		$(PYTHON) setup.py $(PURE) build $(COMPILERFLAG)