From: Ramiro Polla <ramiro.polla@gmail.com>
To: ffmpeg-devel@ffmpeg.org
Subject: Re: [FFmpeg-devel] [PATCH] build: remove unused SLIBOBJS variable
Date: Thu, 22 May 2025 00:22:36 +0200
Message-ID: <CALweWgDgyuyCsM47sy-Y+X_N2do_0yfwF-5QFY07ajN6shSPkA@mail.gmail.com> (raw)
In-Reply-To: <20250516223633.25196-1-ramiro.polla@gmail.com>
On Sat, May 17, 2025 at 12:36 AM Ramiro Polla <ramiro.polla@gmail.com> wrote:
>
> The SLIBOBJS variable was introduced in 56572787ae2 but is no longer used.
> Another variable, SHLIBOBJS, was introduced after SLIBOBJS, in 20b0d24c2f7.
> The functionality from SLIBOBJS was effectively migrated to SHLIBOBJS in b77fff47d0d.
>
> No code has used SLIBOBJS since.
>
> This commit removes all remaining references to SLIBOBJS from the build system.
> ---
> Makefile | 3 +--
> ffbuild/common.mak | 7 ++-----
> ffbuild/library.mak | 2 +-
> 3 files changed, 4 insertions(+), 8 deletions(-)
>
> diff --git a/Makefile b/Makefile
> index e2250f6bc6..09509bb930 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -104,8 +104,7 @@ SUBDIR_VARS := CLEANFILES FFLIBS HOSTPROGS TESTPROGS TOOLS \
> ALTIVEC-OBJS VSX-OBJS MMX-OBJS X86ASM-OBJS \
> MIPSFPU-OBJS MIPSDSPR2-OBJS MIPSDSP-OBJS MSA-OBJS \
> MMI-OBJS LSX-OBJS LASX-OBJS RV-OBJS RVV-OBJS RVVB-OBJS \
> - OBJS SLIBOBJS SHLIBOBJS STLIBOBJS HOSTOBJS TESTOBJS \
> - SIMD128-OBJS
> + OBJS SHLIBOBJS STLIBOBJS HOSTOBJS TESTOBJS SIMD128-OBJS
>
> define RESET
> $(1) :=
> diff --git a/ffbuild/common.mak b/ffbuild/common.mak
> index 0e1eb1f62b..1ac3c31c1e 100644
> --- a/ffbuild/common.mak
> +++ b/ffbuild/common.mak
> @@ -197,7 +197,6 @@ endif
> include $(SRC_PATH)/ffbuild/arch.mak
>
> OBJS += $(OBJS-yes)
> -SLIBOBJS += $(SLIBOBJS-yes)
> SHLIBOBJS += $(SHLIBOBJS-yes)
> STLIBOBJS += $(STLIBOBJS-yes)
> FFLIBS := $($(NAME)_FFLIBS) $(FFLIBS-yes) $(FFLIBS)
> @@ -207,7 +206,6 @@ LDLIBS = $(FFLIBS:%=%$(BUILDSUF))
> FFEXTRALIBS := $(LDLIBS:%=$(LD_LIB)) $(foreach lib,EXTRALIBS-$(NAME) $(FFLIBS:%=EXTRALIBS-%),$($(lib))) $(EXTRALIBS)
>
> OBJS := $(sort $(OBJS:%=$(SUBDIR)%))
> -SLIBOBJS := $(sort $(SLIBOBJS:%=$(SUBDIR)%))
> SHLIBOBJS := $(sort $(SHLIBOBJS:%=$(SUBDIR)%))
> STLIBOBJS := $(sort $(STLIBOBJS:%=$(SUBDIR)%))
> TESTOBJS := $(TESTOBJS:%=$(SUBDIR)tests/%) $(TESTPROGS:%=$(SUBDIR)tests/%.o)
> @@ -245,13 +243,12 @@ $(HOSTPROGS): %$(HOSTEXESUF): %.o
> $(OBJS): | $(sort $(dir $(OBJS)))
> $(HOBJS): | $(sort $(dir $(HOBJS)))
> $(HOSTOBJS): | $(sort $(dir $(HOSTOBJS)))
> -$(SLIBOBJS): | $(sort $(dir $(SLIBOBJS)))
> $(SHLIBOBJS): | $(sort $(dir $(SHLIBOBJS)))
> $(STLIBOBJS): | $(sort $(dir $(STLIBOBJS)))
> $(TESTOBJS): | $(sort $(dir $(TESTOBJS)))
> $(TOOLOBJS): | tools
>
> -OUTDIRS := $(OUTDIRS) $(dir $(OBJS) $(HOBJS) $(HOSTOBJS) $(SLIBOBJS) $(SHLIBOBJS) $(STLIBOBJS) $(TESTOBJS))
> +OUTDIRS := $(OUTDIRS) $(dir $(OBJS) $(HOBJS) $(HOSTOBJS) $(SHLIBOBJS) $(STLIBOBJS) $(TESTOBJS))
>
> CLEANSUFFIXES = *.d *.gcda *.gcno *.h.c *.ho *.map *.o *.objs *.pc *.ptx *.ptx.gz *.ptx.c *.ver *.version *.html.gz *.html.c *.css.gz *.css.c *$(DEFAULT_X86ASMD).asm *~ *.ilk *.pdb
> LIBSUFFIXES = *.a *.lib *.so *.so.* *.dylib *.dll *.def *.dll.a
> @@ -263,4 +260,4 @@ endef
>
> $(eval $(RULES))
>
> --include $(wildcard $(OBJS:.o=.d) $(HOSTOBJS:.o=.d) $(TESTOBJS:.o=.d) $(HOBJS:.o=.d) $(SHLIBOBJS:.o=.d) $(STLIBOBJS:.o=.d) $(SLIBOBJS:.o=.d)) $(OBJS:.o=$(DEFAULT_X86ASMD).d)
> +-include $(wildcard $(OBJS:.o=.d) $(HOSTOBJS:.o=.d) $(TESTOBJS:.o=.d) $(HOBJS:.o=.d) $(SHLIBOBJS:.o=.d) $(STLIBOBJS:.o=.d)) $(OBJS:.o=$(DEFAULT_X86ASMD).d)
> diff --git a/ffbuild/library.mak b/ffbuild/library.mak
> index 288c82a177..569708c73b 100644
> --- a/ffbuild/library.mak
> +++ b/ffbuild/library.mak
> @@ -70,7 +70,7 @@ $(SUBDIR)lib$(NAME).ver: $(SUBDIR)lib$(NAME).v $(OBJS)
> $(SUBDIR)$(SLIBNAME): $(SUBDIR)$(SLIBNAME_WITH_MAJOR)
> $(Q)cd ./$(SUBDIR) && $(LN_S) $(SLIBNAME_WITH_MAJOR) $(SLIBNAME)
>
> -$(SUBDIR)$(SLIBNAME_WITH_MAJOR): $(OBJS) $(SHLIBOBJS) $(SLIBOBJS) $(SUBDIR)lib$(NAME).ver
> +$(SUBDIR)$(SLIBNAME_WITH_MAJOR): $(OBJS) $(SHLIBOBJS) $(SUBDIR)lib$(NAME).ver
> $(SLIB_CREATE_DEF_CMD)
> ifeq ($(RESPONSE_FILES),yes)
> $(Q)echo $$(filter %.o,$$^) > $$@.objs
> --
> 2.39.5
I'll apply tomorrow if there are no objections.
Ramiro
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
prev parent reply other threads:[~2025-05-21 22:23 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-05-16 22:36 Ramiro Polla
2025-05-21 22:22 ` Ramiro Polla [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CALweWgDgyuyCsM47sy-Y+X_N2do_0yfwF-5QFY07ajN6shSPkA@mail.gmail.com \
--to=ramiro.polla@gmail.com \
--cc=ffmpeg-devel@ffmpeg.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git