videolan
/
vlc
mirror of https://code.videolan.org/videolan/vlc
1
Fork 0
Code Releases Activity

contrib: zlib: disable --version-script on static libraries 

According to the documentation it's only useful for shared libraries.
With recent Android NDK this leads to linking issues with gz_intmax
In autotools it's only set with LDSHARED.

https://ftp.gnu.org/old-gnu/Manuals/ld-2.9.1/html_chapter/ld_3.html
This commit is contained in:
Steve Lhomme 2024-04-10 13:22:49 +02:00
parent 0a0bfaa34c
commit e50ca0c0b4
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/src/zlib/rules.mak
View File

@ -19,6 +19,8 @@ zlib: zlib-$(ZLIB_VERSION).tar.xz .sum-zlib
sed -e 's,install(TARGETS zlib zlibstatic,install(TARGETS zlibstatic,' -i.orig $(UNPACK_DIR)/CMakeLists.txt
# only use the proper libz name for the static library
sed -e 's,set_target_properties(zlib zlibstatic ,set_target_properties(zlibstatic ,' -i.orig $(UNPACK_DIR)/CMakeLists.txt
# don't use --version-script on static libraries
sed -e 's,if(NOT APPLE AND NOT(CMAKE_SYSTEM_NAME STREQUAL AIX)),if(BUILD_SHARED_LIBS AND (NOT APPLE AND NOT(CMAKE_SYSTEM_NAME STREQUAL AIX))),' -i.orig $(UNPACK_DIR)/CMakeLists.txt
$(MOVE)
ZLIB_CONF = -DINSTALL_PKGCONFIG_DIR:STRING=$(PREFIX)/lib/pkgconfig -DZLIB_BUILD_EXAMPLES=OFF