Skip to content

Commit

Permalink
See if we can enable position independent code across the board for zlib
Browse files Browse the repository at this point in the history
  • Loading branch information
starseeker committed Jan 3, 2025
1 parent e1435bd commit 306f402
Showing 1 changed file with 12 additions and 8 deletions.
20 changes: 12 additions & 8 deletions zlib/zlib.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
diff -Naur zlib/CMakeLists.txt ZLIB_BLD/CMakeLists.txt
--- zlib/CMakeLists.txt 2024-03-14 20:07:06.811461199 -0400
+++ ZLIB_BLD/CMakeLists.txt 2024-03-14 20:02:42.716002504 -0400
@@ -3,6 +3,13 @@
--- zlib/CMakeLists.txt 2025-01-02 21:07:37.801523356 -0500
+++ ZLIB_BLD/CMakeLists.txt 2025-01-02 21:08:09.170946446 -0500
@@ -3,8 +3,17 @@

project(zlib C)

Expand All @@ -14,8 +14,12 @@ diff -Naur zlib/CMakeLists.txt ZLIB_BLD/CMakeLists.txt
+
set(VERSION "1.3.1")

+set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+
option(ZLIB_BUILD_EXAMPLES "Enable Zlib Examples" ON)
@@ -57,41 +64,38 @@

set(INSTALL_BIN_DIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Installation directory for executables")
@@ -57,41 +66,38 @@
# Check for unistd.h
#
check_include_file(unistd.h Z_HAVE_UNISTD_H)
Expand Down Expand Up @@ -76,7 +80,7 @@ diff -Naur zlib/CMakeLists.txt ZLIB_BLD/CMakeLists.txt
)
set(ZLIB_PRIVATE_HDRS
crc32.h
@@ -122,14 +126,8 @@
@@ -122,14 +128,8 @@
zutil.c
)

Expand All @@ -92,7 +96,7 @@ diff -Naur zlib/CMakeLists.txt ZLIB_BLD/CMakeLists.txt
string(REGEX REPLACE ".*#define[ \t]+ZLIB_VERSION[ \t]+\"([-0-9A-Za-z.]+)\".*"
"\\1" ZLIB_FULL_VERSION ${_zlib_h_contents})

@@ -147,16 +145,35 @@
@@ -147,16 +147,35 @@
-o ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj
-i ${CMAKE_CURRENT_SOURCE_DIR}/win32/zlib1.rc)
set(ZLIB_DLL_SRCS ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj)
Expand Down Expand Up @@ -129,7 +133,7 @@ diff -Naur zlib/CMakeLists.txt ZLIB_BLD/CMakeLists.txt
# This property causes shared libraries on Linux to have the full version
# encoded into their final filename. We disable this on Cygwin because
# it causes cygz-${ZLIB_FULL_VERSION}.dll to be created when cygz.dll
@@ -165,18 +182,12 @@
@@ -165,18 +184,12 @@
# This has no effect with MSVC, on that platform the version info for
# the DLL comes from the resource file win32/zlib1.rc
set_target_properties(zlib PROPERTIES VERSION ${ZLIB_FULL_VERSION})
Expand All @@ -152,7 +156,7 @@ diff -Naur zlib/CMakeLists.txt ZLIB_BLD/CMakeLists.txt

if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL )
install(TARGETS zlib zlibstatic
@@ -187,12 +198,7 @@
@@ -187,12 +200,7 @@
if(NOT SKIP_INSTALL_HEADERS AND NOT SKIP_INSTALL_ALL )
install(FILES ${ZLIB_PUBLIC_HDRS} DESTINATION "${INSTALL_INC_DIR}")
endif()
Expand Down

0 comments on commit 306f402

Please sign in to comment.