reduce diff, skip compiliation of static lincurl on mac (system install works, dev tools include headers)

Author: bmoffatt

awslambdaric/bootstrap.py

@@ -37,7 +37,7 @@
 
 def _get_handler(handler):
     try:
-        modname, fname = handler.rsplit(".", 1)
+        (modname, fname) = handler.rsplit(".", 1)
     except ValueError as e:
         raise FaultException(
             FaultException.MALFORMED_HANDLER_NAME,

deps/curl-7.83.1.tar.gz

@@ -14,34 +14,32 @@ else
     exit 1
 fi
 
+skip () {
+    [ "$(uname)" = "Darwin" ]
+}
+
 cd deps
 . ./versions
 
 CURL_VERSION="${CURL_MAJOR_VERSION}.${CURL_MINOR_VERSION}.${CURL_PATCH_VERSION}"
 
-rm -rf ./curl-$CURL_VERSION
+skip || rm -rf ./curl-$CURL_VERSION
 rm -rf ./aws-lambda-cpp-$AWS_LAMBDA_CPP_RELEASE
 
 # unpack dependencies
-tar xzf ./curl-$CURL_VERSION.tar.gz --no-same-owner && \
+skip || tar xzf ./curl-$CURL_VERSION.tar.gz --no-same-owner && \
 tar xzf ./aws-lambda-cpp-$AWS_LAMBDA_CPP_RELEASE.tar.gz --no-same-owner
 
-(
+skip || (
     # Build Curl
-    export CFLAGS="$CFLAGS -Wno-deprecated-declarations"
     cd curl-$CURL_VERSION && \
         ./buildconf && \
         ./configure \
             --prefix "$ARTIFACTS_DIR" \
             --disable-shared \
-            --disable-ldap \
-            --disable-ldaps \
             --without-ssl \
             --with-pic \
-            --without-zlib  \
-            --without-nghttp2 \
-            --without-nghttp3 \
-            --without-ngtcp2 &&
+            --without-zlib && \
         make && \
         make install
 )
@@ -52,7 +50,7 @@ tar xzf ./aws-lambda-cpp-$AWS_LAMBDA_CPP_RELEASE.tar.gz --no-same-owner
         cd ./aws-lambda-cpp-$AWS_LAMBDA_CPP_RELEASE/build
 
     $CMAKE .. \
-            -DCMAKE_CXX_FLAGS="-fPIC -Wno-deprecated-declarations" \
+            -DCMAKE_CXX_FLAGS="-fPIC" \
             -DCMAKE_INSTALL_PREFIX="$ARTIFACTS_DIR" \
             -DENABLE_LTO=$ENABLE_LTO \
             -DCMAKE_MODULE_PATH="$ARTIFACTS_DIR"/lib/pkgconfig && \

scripts/preinstall.sh

@@ -19,7 +19,10 @@ def get_curl_extra_linker_flags():
     check_call(["./scripts/preinstall.sh"])
 
     # call curl-config to get the required linker flags
-    cmd = ["./deps/artifacts/bin/curl-config", "--static-libs"]
+    if platform.system() in {"Darwin"}:
+        cmd = ["curl-config", "--libs"]
+    else:
+        cmd = ["./deps/artifacts/bin/curl-config", "--static-libs"]
     curl_config = check_output(cmd).decode("utf-8").replace("\n", "")
 
     # It is expected that the result of the curl-config call is similar to