-
Notifications
You must be signed in to change notification settings - Fork 1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update zlib_dont_build_more_than_needed.patch
- Loading branch information
1 parent
f5a0d3d
commit e95b9db
Showing
1 changed file
with
33 additions
and
33 deletions.
There are no files selected for viewing
66 changes: 33 additions & 33 deletions
66
build/fbcode_builder/patches/zlib_dont_build_more_than_needed.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,34 +1,34 @@ | ||
| diff -Naur ../zlib-1.3.1/CMakeLists.txt ./CMakeLists.txt | ||
| --- ../zlib-1.3.1/CMakeLists.txt 2024-01-22 10:32:37.000000000 -0800 | ||
| +++ ./CMakeLists.txt 2024-01-23 13:14:09.870289968 -0800 | ||
| @@ -149,10 +149,8 @@ | ||
| set(ZLIB_DLL_SRCS ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj) | ||
| endif(MINGW) | ||
|
|
||
| -add_library(zlib SHARED ${ZLIB_SRCS} ${ZLIB_DLL_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS}) | ||
| +add_library(zlib ${ZLIB_SRCS} ${ZLIB_DLL_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS}) | ||
| target_include_directories(zlib PUBLIC ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}) | ||
| -add_library(zlibstatic STATIC ${ZLIB_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS}) | ||
| -target_include_directories(zlibstatic PUBLIC ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}) | ||
| set_target_properties(zlib PROPERTIES DEFINE_SYMBOL ZLIB_DLL) | ||
| set_target_properties(zlib PROPERTIES SOVERSION 1) | ||
|
|
||
| @@ -169,7 +167,7 @@ | ||
|
|
||
| if(UNIX) | ||
| # On unix-like platforms the library is almost always called libz | ||
| - set_target_properties(zlib zlibstatic PROPERTIES OUTPUT_NAME z) | ||
| + set_target_properties(zlib PROPERTIES OUTPUT_NAME z) | ||
| if(NOT APPLE AND NOT(CMAKE_SYSTEM_NAME STREQUAL AIX)) | ||
| set_target_properties(zlib PROPERTIES LINK_FLAGS "-Wl,--version-script,\"${CMAKE_CURRENT_SOURCE_DIR}/zlib.map\"") | ||
| endif() | ||
| @@ -179,7 +177,7 @@ | ||
| endif() | ||
|
|
||
| if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL ) | ||
| - install(TARGETS zlib zlibstatic | ||
| + install(TARGETS zlib | ||
| RUNTIME DESTINATION "${INSTALL_BIN_DIR}" | ||
| ARCHIVE DESTINATION "${INSTALL_LIB_DIR}" | ||
| LIBRARY DESTINATION "${INSTALL_LIB_DIR}" ) | ||
| diff -Naur ../zlib-1.3.1/CMakeLists.txt ./CMakeLists.txt | ||
| --- ../zlib-1.3.1/CMakeLists.txt 2024-01-22 10:32:37.000000000 -0800 | ||
| +++ ./CMakeLists.txt 2024-01-23 13:14:09.870289968 -0800 | ||
| @@ -149,10 +149,8 @@ | ||
| set(ZLIB_DLL_SRCS ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj) | ||
| endif(MINGW) | ||
|
|
||
| -add_library(zlib SHARED ${ZLIB_SRCS} ${ZLIB_DLL_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS}) | ||
| +add_library(zlib ${ZLIB_SRCS} ${ZLIB_DLL_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS}) | ||
| target_include_directories(zlib PUBLIC ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}) | ||
| -add_library(zlibstatic STATIC ${ZLIB_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS}) | ||
| -target_include_directories(zlibstatic PUBLIC ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}) | ||
| set_target_properties(zlib PROPERTIES DEFINE_SYMBOL ZLIB_DLL) | ||
| set_target_properties(zlib PROPERTIES SOVERSION 1) | ||
|
|
||
| @@ -169,7 +167,7 @@ | ||
|
|
||
| if(UNIX) | ||
| # On unix-like platforms the library is almost always called libz | ||
| - set_target_properties(zlib zlibstatic PROPERTIES OUTPUT_NAME z) | ||
| + set_target_properties(zlib PROPERTIES OUTPUT_NAME z) | ||
| if(NOT APPLE AND NOT(CMAKE_SYSTEM_NAME STREQUAL AIX)) | ||
| set_target_properties(zlib PROPERTIES LINK_FLAGS "-Wl,--version-script,\"${CMAKE_CURRENT_SOURCE_DIR}/zlib.map\"") | ||
| endif() | ||
| @@ -179,7 +177,7 @@ | ||
| endif() | ||
|
|
||
| if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL ) | ||
| - install(TARGETS zlib zlibstatic | ||
| + install(TARGETS zlib | ||
| RUNTIME DESTINATION "${INSTALL_BIN_DIR}" | ||
| ARCHIVE DESTINATION "${INSTALL_LIB_DIR}" | ||
| LIBRARY DESTINATION "${INSTALL_LIB_DIR}" ) | ||
|
|