Merged PR 1096935: Build on Linux

A bug on the CMakeLists.txt file that zlib provides makes zlib fail to compile when is used via add_subdirectory() by another project. For some reason, this issue only happens for Linux.

There's an already existing open PR since Feb 2017 with the fix (madler/zlib#219). This PR changes the zlib submodule to point to that commit.

CMakeLists.txt

@@ -36,6 +36,8 @@ ELSE()
     ENDIF()
     IF (LINUX)
         MESSAGE (STATUS "Building for Linux")
+        # Static libraries must be position independent to be linked with a shared object.
+        set(CMAKE_POSITION_INDEPENDENT_CODE ON)
     ENDIF()
 ENDIF()
 

makelinux

@@ -0,0 +1,10 @@
+#!/bin/bash
+# script to build on mac
+mkdir .vs
+cd .vs
+
+# clean up any old builds of xPlatAppx modules
+find . -name *xPlatAppx* -d | xargs rm -r
+
+cmake -DLINUX=on ..
+make

src/CMakeLists.txt

@@ -9,6 +9,6 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/../cmake)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/inc)
 
 add_subdirectory(xPlatAppx)
-add_subdirectory(MakeXPlat)
+add_subdirectory(MakeXplat)
 
-ADD_DEPENDENCIES(MakeXplat xPlatAppx)
+ADD_DEPENDENCIES(MakeXplat xPlatAppx)