From: James Almer <jamrial@gmail.com>
Date: Sat, 21 Oct 2017 15:50:49 +0000 (-0300)
Subject: Merge commit '0d8013b88b1cb7d65da891a8819d3beebafb9bb5'
X-Git-Tag: n4.1-dev~2189
X-Git-Url: http://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff_plain/13c84b077acecd1e850d41a93dec5c1735d69331

Merge commit '0d8013b88b1cb7d65da891a8819d3beebafb9bb5'

* commit '0d8013b88b1cb7d65da891a8819d3beebafb9bb5':
  configure: Replace -no_weak_symbols with -Werror=partial-availability

Merged-by: James Almer <jamrial@gmail.com>
---

13c84b077acecd1e850d41a93dec5c1735d69331
diff --cc configure
index 36279d5,665df27..4f3355c
--- a/configure
+++ b/configure
@@@ -5034,17 -3945,15 +5034,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
+         check_cflags -Werror=partial-availability
          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'