[PR] Makefile: skip STRIP step when stripping is disabled (PR #23620)

PR #23620 opened by Kacper Michajłow (kasper93)
URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/23620
Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/23620.patch


From f4540b79543909d29ca085b1aa77db1dd6fbd211 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kacper=20Michaj=C5=82ow?= <[email protected]>
Date: Sun, 28 Jun 2026 00:25:07 +0200
Subject: [PATCH 1/2] Makefile: skip STRIP step when stripping is disabled
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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)")
-- 
2.52.0


From 9301b14a10d27a87636479ee53881ad212143005 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kacper=20Michaj=C5=82ow?= <[email protected]>
Date: Sun, 28 Jun 2026 00:26:54 +0200
Subject: [PATCH 2/2] Makefile: hide verbose command from linking step
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

They are part of LD(XX) step, and shouldn't be shown if verbose output
is not enabled.

Signed-off-by: Kacper Michajłow <[email protected]>
---
 ffbuild/library.mak | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ffbuild/library.mak b/ffbuild/library.mak
index 4614b98167..89908d247e 100644
--- a/ffbuild/library.mak
+++ b/ffbuild/library.mak
@@ -93,13 +93,13 @@ else
 	$(Q)echo $$(filter %.o,$$^) > [email protected]
 endif
 endif
-	$(SLIB_CREATE_DEF_CMD)
+	$(Q)$(SLIB_CREATE_DEF_CMD)
 ifeq ($(RESPONSE_FILES),yes)
 	$$(call LINK,$$(call $(NAME)LINK_SO_ARGS) $$(LD_O) @[email protected] $$(call $(NAME)LINK_EXTRA))
 else
 	$$(call LINK,$$(call $(NAME)LINK_SO_ARGS) $$(LD_O) $$(filter %.o,$$^) $$(call $(NAME)LINK_EXTRA))
 endif
-	$(SLIB_EXTRA_CMD)
+	$(Q)$(SLIB_EXTRA_CMD)
 	-$(RM) [email protected]
 
 ifdef SUBDIR
-- 
2.52.0

_______________________________________________
ffmpeg-devel mailing list -- [email protected]
To unsubscribe send an email to [email protected]