This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch master in repository ffmpeg.
commit abb2a04649d383f171305f406fc6733205a22cf5 Author: Kacper Michajłow <[email protected]> AuthorDate: Sun Jun 28 00:25:07 2026 +0200 Commit: Kacper Michajłow <[email protected]> CommitDate: Mon Jun 29 21:22:15 2026 +0000 Makefile: skip STRIP step when stripping is disabled Instead of showing `STRIP` followed by `skipping strip`. Signed-off-by: Kacper Michajłow <[email protected]> --- Makefile | 2 ++ configure | 4 ++-- ffbuild/library.mak | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index ca55556cee..b2761a6151 100644 --- a/Makefile +++ b/Makefile @@ -143,8 +143,10 @@ ifeq ($(STRIPTYPE),direct) else $(RM) $@ $(CP) $< $@ +ifneq ($(STRIPTYPE),nostrip) $(STRIP) $@ endif +endif %$(PROGSSUF)_g$(EXESUF): $(FF_DEP_LIBS) $(call LINK,$(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $(OBJS-$*) $(FF_EXTRALIBS)) diff --git a/configure b/configure index 785e23fb16..70e31c563d 100755 --- a/configure +++ b/configure @@ -8620,8 +8620,8 @@ esc(){ echo "config:$arch:$subarch:$cpu:$target_os:$(esc $cc_ident):$(esc $FFMPEG_CONFIGURATION)" > ffbuild/config.fate -enabled stripping || strip="echo skipping strip" -enabled stripping || striptype="" +enabled stripping || striptype="nostrip" +enabled stripping || ASMSTRIPFLAGS="" config_files="$TMPH ffbuild/config.mak doc/config.texi" diff --git a/ffbuild/library.mak b/ffbuild/library.mak index 2759a73a5c..4614b98167 100644 --- a/ffbuild/library.mak +++ b/ffbuild/library.mak @@ -113,7 +113,9 @@ clean:: install-lib$(NAME)-shared: $(SUBDIR)$(SLIBNAME) $(Q)mkdir -p "$(SHLIBDIR)" $$(INSTALL) -m 755 $$< "$(SHLIBDIR)/$(SLIB_INSTALL_NAME)" +ifneq ($(STRIPTYPE),nostrip) $$(STRIP) "$(SHLIBDIR)/$(SLIB_INSTALL_NAME)" +endif $(Q)$(foreach F,$(SLIB_INSTALL_LINKS),(cd "$(SHLIBDIR)" && $(LN_S) $(SLIB_INSTALL_NAME) $(F));) $(if $(SLIB_INSTALL_EXTRA_SHLIB),$$(INSTALL) -m 644 $(SLIB_INSTALL_EXTRA_SHLIB:%=$(SUBDIR)%) "$(SHLIBDIR)") $(if $(SLIB_INSTALL_EXTRA_LIB),$(Q)mkdir -p "$(LIBDIR)") _______________________________________________ ffmpeg-cvslog mailing list -- [email protected] To unsubscribe send an email to [email protected]
