ffmpeg | branch: master | James Almer <jamr...@gmail.com> | Tue Oct 17 15:14:10 2017 -0300| [d8f382ce05fabdceda3bcf9297fa54510ae0a159] | committer: James Almer
Merge commit '81bffae368f331b6cd386a814f225a58e3f32f40' * commit '81bffae368f331b6cd386a814f225a58e3f32f40': configure: Check for -no_weak_imports in ldflags on macOS Merged-by: James Almer <jamr...@gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d8f382ce05fabdceda3bcf9297fa54510ae0a159 --- configure | 1 + 1 file changed, 1 insertion(+) diff --git a/configure b/configure index 6e7faf55b6..62c185586d 100755 --- a/configure +++ b/configure @@ -5032,6 +5032,7 @@ case $target_os in enabled x86_32 && append SHFLAGS -Wl,-read_only_relocs,suppress strip="${strip} -x" add_ldflags -Wl,-dynamic,-search_paths_first + check_ldflags -Wl,-no_weak_imports SLIBSUF=".dylib" SLIBNAME_WITH_VERSION='$(SLIBPREF)$(FULLNAME).$(LIBVERSION)$(SLIBSUF)' SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(FULLNAME).$(LIBMAJOR)$(SLIBSUF)' ====================================================================== diff --cc configure index 6e7faf55b6,f915871b5c..62c185586d --- a/configure +++ b/configure @@@ -5027,16 -3945,15 +5027,17 @@@ case $target_os i ;; darwin) enabled ppc && add_asflags -force_cpusubtype_ALL - SHFLAGS='-dynamiclib -Wl,-single_module -Wl,-install_name,$(SHLIBDIR)/$(SLIBNAME_WITH_MAJOR),-current_version,$(LIBVERSION),-compatibility_version,$(LIBMAJOR)' + install_name_dir_default='$(SHLIBDIR)' + SHFLAGS='-dynamiclib -Wl,-single_module -Wl,-install_name,$(INSTALL_NAME_DIR)/$(SLIBNAME_WITH_MAJOR),-current_version,$(LIBVERSION),-compatibility_version,$(LIBMAJOR)' enabled x86_32 && append SHFLAGS -Wl,-read_only_relocs,suppress + strip="${strip} -x" add_ldflags -Wl,-dynamic,-search_paths_first + check_ldflags -Wl,-no_weak_imports SLIBSUF=".dylib" - SLIBNAME_WITH_VERSION='$(SLIBPREF)$(NAME).$(LIBVERSION)$(SLIBSUF)' - SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(NAME).$(LIBMAJOR)$(SLIBSUF)' + SLIBNAME_WITH_VERSION='$(SLIBPREF)$(FULLNAME).$(LIBVERSION)$(SLIBSUF)' + SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(FULLNAME).$(LIBMAJOR)$(SLIBSUF)' enabled x86_64 && objformat="macho64" || objformat="macho32" - enabled_any pic shared || + enabled_any pic shared x86_64 || { check_cflags -mdynamic-no-pic && add_asflags -mdynamic-no-pic; } check_header dispatch/dispatch.h && add_cppflags '-I\$(SRC_PATH)/compat/dispatch_semaphore' _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
