Steve Lhomme pushed to branch master at VideoLAN / VLC
Commits:
e50ca0c0 by Steve Lhomme at 2024-04-13T11:33:53+00:00
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
- - - - -
1 changed file:
- contrib/src/zlib/rules.mak
Changes:
=====================================
contrib/src/zlib/rules.mak
=====================================
@@ -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
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/e50ca0c0b407195d7d3ecc77fdaccb2ec01eda6d
--
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/e50ca0c0b407195d7d3ecc77fdaccb2ec01eda6d
You're receiving this email because of your account on code.videolan.org.
VideoLAN code repository instance_______________________________________________
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
