Allow building on macos

Author: mraerino

deps/aws-lambda-cpp-0.2.6.tar.gz

@@ -0,0 +1,22 @@
+diff --git a/include/backward.h b/include/backward.h
+index e065783..9e369a6 100644
+--- a/include/backward.h
++++ b/include/backward.h
+@@ -43,7 +43,7 @@
+
+ // You can define one of the following (or leave it to the auto-detection):
+ //
+-#    define BACKWARD_SYSTEM_LINUX
++// #define BACKWARD_SYSTEM_LINUX
+ //	- specialization for linux
+ //
+ // #define BACKWARD_SYSTEM_DARWIN
+@@ -3057,7 +3057,7 @@ public:
+         if (st.size() == 0) {
+             return;
+         }
+-        _symbols.reset(backtrace_symbols(st.begin(), st.size()));
++        _symbols.reset(backtrace_symbols(st.begin(), (int)st.size()));
+     }
+
+     ResolvedTrace resolve(ResolvedTrace trace)

deps/patches/aws-lambda-cpp-macos-fixes.patch

@@ -2,11 +2,7 @@
 # Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 set -e
 
-if [ "$(uname)" = "Darwin" ]; then
-    echo "aws-lambda-cpp does not build on OS X. Skipping the postinstall step."
-else
-    npm run build:gyp
-fi
+npm run build:gyp
 
 # If the path of this file ends in "node_modules/aws-lambda-ric/scripts"
 # the package is being installed as a dependency and we can clean the deps folder.

scripts/postinstall.sh

@@ -4,47 +4,43 @@ set -e
 
 ARTIFACTS_DIR=$(pwd)/deps/artifacts
 
-if [ "$(uname)" = "Darwin" ]; then
-    echo "aws-lambda-cpp does not build on OS X. Skipping the preinstall step."
+if [ -x "$(command -v cmake3)" ]; then
+    CMAKE=cmake3
+elif [ -x "$(command -v cmake)" ]; then
+    CMAKE=cmake
 else
-    if [ -x "$(command -v cmake3)" ]; then
-        CMAKE=cmake3
-    elif [ -x "$(command -v cmake)" ]; then
-        CMAKE=cmake
-    else
-        echo 'Error: cmake is not installed.' >&2
-        exit 1
-    fi
+    echo 'Error: cmake is not installed.' >&2
+    exit 1
+fi
 
-    cd deps
-    . ./versions
+cd deps
+. ./versions
 
-    # unpack dependencies
-    tar xzf ./curl-$CURL_VERSION.tar.gz && \
-    tar xzf ./aws-lambda-cpp-$AWS_LAMBDA_CPP_RELEASE.tar.gz
+# unpack dependencies
+tar xzf ./curl-$CURL_VERSION.tar.gz && \
+tar xzf ./aws-lambda-cpp-$AWS_LAMBDA_CPP_RELEASE.tar.gz
 
-    (
-        # Build Curl
-        cd curl-curl-$CURL_VERSION && \
-            ./buildconf && \
-            ./configure \
-                --prefix "$ARTIFACTS_DIR" \
-                --disable-shared \
-                --without-ssl \
-                --without-zlib && \
-            make && \
-            make install
-    )
+(
+    # Build Curl
+    cd curl-curl-$CURL_VERSION && \
+        ./buildconf && \
+        ./configure \
+            --prefix "$ARTIFACTS_DIR" \
+            --disable-shared \
+            --without-ssl \
+            --without-zlib && \
+        make && \
+        make install
+)
 
-    (
-        # Build aws-lambda-cpp
-        mkdir -p ./aws-lambda-cpp-$AWS_LAMBDA_CPP_RELEASE/build && \
-            cd ./aws-lambda-cpp-$AWS_LAMBDA_CPP_RELEASE/build
+(
+    # Build aws-lambda-cpp
+    mkdir -p ./aws-lambda-cpp-$AWS_LAMBDA_CPP_RELEASE/build && \
+        cd ./aws-lambda-cpp-$AWS_LAMBDA_CPP_RELEASE/build
 
-        $CMAKE .. \
-                -DCMAKE_CXX_FLAGS="-fPIC" \
-                -DCMAKE_INSTALL_PREFIX="$ARTIFACTS_DIR" \
-                -DCMAKE_MODULE_PATH="$ARTIFACTS_DIR"/lib/pkgconfig && \
-            make && make install
-    )
-fi
+    $CMAKE .. \
+            -DCMAKE_CXX_FLAGS="-fPIC" \
+            -DCMAKE_INSTALL_PREFIX="$ARTIFACTS_DIR" \
+            -DCMAKE_MODULE_PATH="$ARTIFACTS_DIR"/lib/pkgconfig && \
+        make && make install
+)

scripts/preinstall.sh

@@ -22,7 +22,8 @@ wget -c https://github.com/awslabs/aws-lambda-cpp/archive/v$AWS_LAMBDA_CPP_RELEA
     patch -p1 < ../patches/aws-lambda-cpp-posting-init-errors.patch && \
     patch -p1 < ../patches/aws-lambda-cpp-make-the-runtime-client-user-agent-overrideable.patch && \
     patch -p1 < ../patches/aws-lambda-cpp-make-lto-optional.patch && \
-    patch -p1 < ../patches/aws-lambda-cpp-add-content-type.patch
+    patch -p1 < ../patches/aws-lambda-cpp-add-content-type.patch && \
+    patch -p1 < ../patches/aws-lambda-cpp-macos-fixes.patch
 )
 
 # Pack again and remove the folder