From 2ffea137594d957d75a6090a91a609c6b4250754 Mon Sep 17 00:00:00 2001
From: Christian Blichmann <mail@blichmann.eu>
Date: Tue, 30 Jun 2020 08:52:33 +0200
Subject: [PATCH 1/2] Mark zlib as found when using SAPI CMake build

Signed-off-by: Christian Blichmann <mail@blichmann.eu>
---
 cmake/zlib/Download.cmake                           | 1 +
 sandboxed_api/sandbox2/examples/zlib/CMakeLists.txt | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/cmake/zlib/Download.cmake b/cmake/zlib/Download.cmake
index 126f3cd..24aad46 100644
--- a/cmake/zlib/Download.cmake
+++ b/cmake/zlib/Download.cmake
@@ -34,6 +34,7 @@ endif()
 
 set(_zlib_src "${CMAKE_BINARY_DIR}/zlib-src")
 
+set(ZLIB_FOUND TRUE)
 set(ZLIB_INCLUDE_DIRS ${_zlib_src})
 
 add_library(z STATIC
diff --git a/sandboxed_api/sandbox2/examples/zlib/CMakeLists.txt b/sandboxed_api/sandbox2/examples/zlib/CMakeLists.txt
index 6cd41ab..199a393 100644
--- a/sandboxed_api/sandbox2/examples/zlib/CMakeLists.txt
+++ b/sandboxed_api/sandbox2/examples/zlib/CMakeLists.txt
@@ -12,8 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-find_package(ZLIB REQUIRED)
-
 # sandboxed_api/sandbox2/examples/zlib:zpipe_sandbox
 add_executable(sandbox2_zpipe_sandbox
   zpipe_sandbox.cc

From a51c275a3a476c9f1f09423eae28bf5a2453900f Mon Sep 17 00:00:00 2001
From: Christian Blichmann <mail@blichmann.eu>
Date: Tue, 30 Jun 2020 08:54:44 +0200
Subject: [PATCH 2/2] Avoid arch names in libffi build directories

This is done by simply building libffi in-tree. Normally, this is not
desirable, but in our case is actually ok, as this is an external
dependency to be pulled in and cleaning the source tree is easy in this
case.

Signed-off-by: Christian Blichmann <mail@blichmann.eu>
---
 cmake/libffi/CMakeLists.txt.in | 6 +++---
 cmake/libffi/Download.cmake    | 9 ++++-----
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/cmake/libffi/CMakeLists.txt.in b/cmake/libffi/CMakeLists.txt.in
index 60a0f9e..d4cf198 100644
--- a/cmake/libffi/CMakeLists.txt.in
+++ b/cmake/libffi/CMakeLists.txt.in
@@ -20,9 +20,9 @@ ExternalProject_Add(libffi
   URL https://github.com/libffi/libffi/releases/download/v3.3-rc2/libffi-3.3-rc2.tar.gz
   URL_HASH SHA256=653ffdfc67fbb865f39c7e5df2a071c0beb17206ebfb0a9ecb18a18f63f6b263 # 2019-11-02
   SOURCE_DIR        "${CMAKE_BINARY_DIR}/libffi-src"
-  CONFIGURE_COMMAND sh -c "./configure            \
-                    --disable-dependency-tracking \
-                    && (mv `sh config.guess` configure-cmake-gen || true)"
+  CONFIGURE_COMMAND ./configure
+                    --disable-dependency-tracking
+                    --disable-builddir
   BUILD_COMMAND     ""
   INSTALL_COMMAND   ""
   TEST_COMMAND      ""
diff --git a/cmake/libffi/Download.cmake b/cmake/libffi/Download.cmake
index 77eb32b..3584b0c 100644
--- a/cmake/libffi/Download.cmake
+++ b/cmake/libffi/Download.cmake
@@ -37,11 +37,11 @@ set(_ffi_src "${CMAKE_BINARY_DIR}/libffi-src")
 set(libffi_INCLUDE_DIR ${_ffi_src}/libffi/include)
 
 add_library(ffi STATIC
-  ${_ffi_src}/configure-cmake-gen/fficonfig.h
-  ${_ffi_src}/configure-cmake-gen/include/ffi.h
-  ${_ffi_src}/configure-cmake-gen/include/ffitarget.h
+  ${_ffi_src}/fficonfig.h
+  ${_ffi_src}/include/ffi.h
   ${_ffi_src}/include/ffi_cfi.h
   ${_ffi_src}/include/ffi_common.h
+  ${_ffi_src}/include/ffitarget.h
   ${_ffi_src}/src/closures.c
   ${_ffi_src}/src/debug.c
   ${_ffi_src}/src/java_raw_api.c
@@ -60,8 +60,7 @@ add_library(ffi STATIC
 )
 add_library(libffi::libffi ALIAS ffi)
 target_include_directories(ffi PUBLIC
-  ${_ffi_src}/configure-cmake-gen
-  ${_ffi_src}/configure-cmake-gen/include
+  ${_ffi_src}
   ${_ffi_src}/include
 )
 target_compile_options(ffi PRIVATE