ffmpeg | branch: master | James Almer <jamr...@gmail.com> | Thu Oct 12 14:58:34 2017 -0300| [e4ad3e6f6449f41685d0a640a06c24202c3b5a6e] | committer: James Almer
Merge commit '808ef43597b1e3d6e69a5b9abe2237c8ddb97b44' * commit '808ef43597b1e3d6e69a5b9abe2237c8ddb97b44': build: Explicitly set 32-bit/64-bit object formats for nasm/yasm See d44935cbf4e42e842c11b1eeeaa28377dc8fd6d2 Merged-by: James Almer <jamr...@gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e4ad3e6f6449f41685d0a640a06c24202c3b5a6e --- configure | 1 - 1 file changed, 1 deletion(-) diff --git a/configure b/configure index 6deef0a1ec..7a1f4ba959 100755 --- a/configure +++ b/configure @@ -5032,7 +5032,6 @@ case $target_os in SLIBSUF=".dylib" SLIBNAME_WITH_VERSION='$(SLIBPREF)$(FULLNAME).$(LIBVERSION)$(SLIBSUF)' SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(FULLNAME).$(LIBMAJOR)$(SLIBSUF)' - objformat="macho" enabled x86_64 && objformat="macho64" || objformat="macho32" enabled_any pic shared x86_64 || { check_cflags -mdynamic-no-pic && add_asflags -mdynamic-no-pic; } ====================================================================== diff --cc configure index 6deef0a1ec,397d19c923..7a1f4ba959 --- a/configure +++ b/configure @@@ -5024,17 -3942,14 +5024,16 @@@ 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 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)' - objformat="macho" 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
