Commit e0be794a authored by Mans Rullgard's avatar Mans Rullgard

Remove support for stripping executables

Stripping is generally best left to package management tools, and
since unstripped copies are kept in the build tree, any arguments
about saving space (no matter how insignificant) are void.
Signed-off-by: 's avatarMans Rullgard <mans@mansr.com>
parent d782bca4
...@@ -10,7 +10,6 @@ PROGS-$(CONFIG_FFPROBE) += ffprobe ...@@ -10,7 +10,6 @@ PROGS-$(CONFIG_FFPROBE) += ffprobe
PROGS-$(CONFIG_FFSERVER) += ffserver PROGS-$(CONFIG_FFSERVER) += ffserver
PROGS := $(PROGS-yes:%=%$(EXESUF)) PROGS := $(PROGS-yes:%=%$(EXESUF))
PROGS_G = $(PROGS-yes:%=%_g$(EXESUF))
OBJS = $(PROGS-yes:%=%.o) cmdutils.o OBJS = $(PROGS-yes:%=%.o) cmdutils.o
MANPAGES = $(PROGS-yes:%=doc/%.1) MANPAGES = $(PROGS-yes:%=doc/%.1)
PODPAGES = $(PROGS-yes:%=doc/%.pod) PODPAGES = $(PROGS-yes:%=doc/%.pod)
...@@ -21,7 +20,6 @@ HOSTPROGS := $(TESTTOOLS:%=tests/%) ...@@ -21,7 +20,6 @@ HOSTPROGS := $(TESTTOOLS:%=tests/%)
BASENAMES = ffmpeg ffplay ffprobe ffserver BASENAMES = ffmpeg ffplay ffprobe ffserver
ALLPROGS = $(BASENAMES:%=%$(EXESUF)) ALLPROGS = $(BASENAMES:%=%$(EXESUF))
ALLPROGS_G = $(BASENAMES:%=%_g$(EXESUF))
ALLMANPAGES = $(BASENAMES:%=%.1) ALLMANPAGES = $(BASENAMES:%=%.1)
FFLIBS-$(CONFIG_AVDEVICE) += avdevice FFLIBS-$(CONFIG_AVDEVICE) += avdevice
...@@ -53,10 +51,6 @@ INSTALL_PROGS_TARGETS-$(CONFIG_SHARED) = install-libs ...@@ -53,10 +51,6 @@ INSTALL_PROGS_TARGETS-$(CONFIG_SHARED) = install-libs
all: $(FF_DEP_LIBS) $(PROGS) $(ALL_TARGETS-yes) all: $(FF_DEP_LIBS) $(PROGS) $(ALL_TARGETS-yes)
$(PROGS): %$(EXESUF): %_g$(EXESUF)
$(CP) $< $@
$(STRIP) $@
config.h: .config config.h: .config
.config: $(wildcard $(FFLIBS:%=$(SRC_DIR)/lib%/all*.c)) .config: $(wildcard $(FFLIBS:%=$(SRC_DIR)/lib%/all*.c))
@-tput bold 2>/dev/null @-tput bold 2>/dev/null
...@@ -80,10 +74,10 @@ endef ...@@ -80,10 +74,10 @@ endef
$(foreach D,$(FFLIBS),$(eval $(call DOSUBDIR,lib$(D)))) $(foreach D,$(FFLIBS),$(eval $(call DOSUBDIR,lib$(D))))
ffplay_g$(EXESUF): FF_EXTRALIBS += $(SDL_LIBS) ffplay$(EXESUF): FF_EXTRALIBS += $(SDL_LIBS)
ffserver_g$(EXESUF): FF_LDFLAGS += $(FFSERVERLDFLAGS) ffserver$(EXESUF): FF_LDFLAGS += $(FFSERVERLDFLAGS)
%_g$(EXESUF): %.o cmdutils.o $(FF_DEP_LIBS) %$(EXESUF): %.o cmdutils.o $(FF_DEP_LIBS)
$(LD) $(FF_LDFLAGS) -o $@ $< cmdutils.o $(FF_EXTRALIBS) $(LD) $(FF_LDFLAGS) -o $@ $< cmdutils.o $(FF_EXTRALIBS)
tools/%$(EXESUF): tools/%.o tools/%$(EXESUF): tools/%.o
...@@ -165,7 +159,7 @@ testclean: ...@@ -165,7 +159,7 @@ testclean:
$(RM) $(TESTTOOLS:%=tests/%$(HOSTEXESUF)) $(RM) $(TESTTOOLS:%=tests/%$(HOSTEXESUF))
clean:: testclean clean:: testclean
$(RM) $(ALLPROGS) $(ALLPROGS_G) $(RM) $(ALLPROGS)
$(RM) $(CLEANSUFFIXES) $(RM) $(CLEANSUFFIXES)
$(RM) doc/*.html doc/*.pod doc/*.1 $(RM) doc/*.html doc/*.pod doc/*.1
$(RM) $(TOOLS) $(RM) $(TOOLS)
......
...@@ -21,7 +21,7 @@ endif ...@@ -21,7 +21,7 @@ endif
ifndef V ifndef V
Q = @ Q = @
ECHO = printf "$(1)\t%s\n" $(2) ECHO = printf "$(1)\t%s\n" $(2)
BRIEF = CC AS YASM AR LD HOSTCC STRIP CP BRIEF = CC AS YASM AR LD HOSTCC
SILENT = DEPCC YASMDEP RM RANLIB SILENT = DEPCC YASMDEP RM RANLIB
MSG = $@ MSG = $@
M = @$(call ECHO,$(TAG),$@); M = @$(call ECHO,$(TAG),$@);
......
...@@ -242,7 +242,6 @@ Developer options (useful when working on Libav itself): ...@@ -242,7 +242,6 @@ Developer options (useful when working on Libav itself):
--enable-debug=LEVEL set the debug level [$debuglevel] --enable-debug=LEVEL set the debug level [$debuglevel]
--disable-optimizations disable compiler optimizations --disable-optimizations disable compiler optimizations
--enable-extra-warnings enable more compiler warnings --enable-extra-warnings enable more compiler warnings
--disable-stripping disable stripping of executables and shared libraries
--samples=PATH location of test samples for FATE, if not set use --samples=PATH location of test samples for FATE, if not set use
\$FATE_SAMPLES at make invocation time. \$FATE_SAMPLES at make invocation time.
...@@ -1142,7 +1141,6 @@ CMDLINE_SELECT=" ...@@ -1142,7 +1141,6 @@ CMDLINE_SELECT="
extra_warnings extra_warnings
logging logging
optimizations optimizations
stripping
symver symver
yasm yasm
" "
...@@ -1180,7 +1178,6 @@ CMDLINE_SET=" ...@@ -1180,7 +1178,6 @@ CMDLINE_SET="
pkg_config pkg_config
samples samples
source_path source_path
strip
sysinclude sysinclude
sysroot sysroot
target_exec target_exec
...@@ -1608,7 +1605,6 @@ nm_default="nm" ...@@ -1608,7 +1605,6 @@ nm_default="nm"
objformat="elf" objformat="elf"
pkg_config_default=pkg-config pkg_config_default=pkg-config
ranlib="ranlib" ranlib="ranlib"
strip_default="strip"
yasmexe="yasm" yasmexe="yasm"
nogas=":" nogas=":"
...@@ -1641,7 +1637,6 @@ enable network ...@@ -1641,7 +1637,6 @@ enable network
enable optimizations enable optimizations
enable protocols enable protocols
enable static enable static
enable stripping
enable swscale enable swscale
enable swscale_alpha enable swscale_alpha
...@@ -1818,11 +1813,10 @@ cc_default="${cross_prefix}${cc_default}" ...@@ -1818,11 +1813,10 @@ cc_default="${cross_prefix}${cc_default}"
nm_default="${cross_prefix}${nm_default}" nm_default="${cross_prefix}${nm_default}"
pkg_config_default="${cross_prefix}${pkg_config_default}" pkg_config_default="${cross_prefix}${pkg_config_default}"
ranlib="${cross_prefix}${ranlib}" ranlib="${cross_prefix}${ranlib}"
strip_default="${cross_prefix}${strip_default}"
sysinclude_default="${sysroot}/usr/include" sysinclude_default="${sysroot}/usr/include"
set_default cc nm pkg_config strip sysinclude set_default cc nm pkg_config sysinclude
enabled cross_compile || host_cc_default=$cc enabled cross_compile || host_cc_default=$cc
set_default host_cc set_default host_cc
...@@ -2381,7 +2375,6 @@ case $target_os in ...@@ -2381,7 +2375,6 @@ case $target_os in
;; ;;
bsd/os) bsd/os)
add_extralibs -lpoll -lgnugetopt add_extralibs -lpoll -lgnugetopt
strip="strip -d"
;; ;;
darwin) darwin)
enable malloc_aligned enable malloc_aligned
...@@ -2389,7 +2382,6 @@ case $target_os in ...@@ -2389,7 +2382,6 @@ case $target_os in
enabled ppc && add_asflags -force_cpusubtype_ALL enabled ppc && add_asflags -force_cpusubtype_ALL
SHFLAGS='-dynamiclib -Wl,-single_module -Wl,-install_name,$(SHLIBDIR)/$(SLIBNAME),-current_version,$(LIBVERSION),-compatibility_version,$(LIBMAJOR)' SHFLAGS='-dynamiclib -Wl,-single_module -Wl,-install_name,$(SHLIBDIR)/$(SLIBNAME),-current_version,$(LIBVERSION),-compatibility_version,$(LIBMAJOR)'
enabled x86_32 && append SHFLAGS -Wl,-read_only_relocs,suppress enabled x86_32 && append SHFLAGS -Wl,-read_only_relocs,suppress
strip="${strip} -x"
add_ldflags -Wl,-dynamic,-search_paths_first add_ldflags -Wl,-dynamic,-search_paths_first
SLIBSUF=".dylib" SLIBSUF=".dylib"
SLIBNAME_WITH_VERSION='$(SLIBPREF)$(FULLNAME).$(LIBVERSION)$(SLIBSUF)' SLIBNAME_WITH_VERSION='$(SLIBPREF)$(FULLNAME).$(LIBVERSION)$(SLIBSUF)'
...@@ -2459,7 +2451,6 @@ case $target_os in ...@@ -2459,7 +2451,6 @@ case $target_os in
ranlib="echo ignoring ranlib" ranlib="echo ignoring ranlib"
;; ;;
os/2*) os/2*)
strip="lxlite -CS"
ln_s="cp -f" ln_s="cp -f"
add_ldflags -Zomf -Zbin-files -Zargs-wild -Zmap add_ldflags -Zomf -Zbin-files -Zargs-wild -Zmap
SHFLAGS='$(SUBDIR)$(NAME).def -Zdll -Zomf' SHFLAGS='$(SUBDIR)$(NAME).def -Zdll -Zomf'
...@@ -3110,7 +3101,6 @@ if enabled sparc; then ...@@ -3110,7 +3101,6 @@ if enabled sparc; then
echo "VIS enabled ${vis-no}" echo "VIS enabled ${vis-no}"
fi fi
echo "debug symbols ${debug-no}" echo "debug symbols ${debug-no}"
echo "strip symbols ${stripping-no}"
echo "optimizations ${optimizations-no}" echo "optimizations ${optimizations-no}"
echo "static ${static-no}" echo "static ${static-no}"
echo "shared ${shared-no}" echo "shared ${shared-no}"
...@@ -3204,8 +3194,6 @@ if enabled source_path_used; then ...@@ -3204,8 +3194,6 @@ if enabled source_path_used; then
map 'test -f "$source_path/$v" && $ln_s "$source_path/$v" $v' $FILES map 'test -f "$source_path/$v" && $ln_s "$source_path/$v" $v' $FILES
fi fi
enabled stripping || strip="echo skipping strip"
config_files="$TMPH config.mak" config_files="$TMPH config.mak"
cat > config.mak <<EOF cat > config.mak <<EOF
...@@ -3233,9 +3221,7 @@ YASM=$yasmexe ...@@ -3233,9 +3221,7 @@ YASM=$yasmexe
YASMDEP=$yasmexe YASMDEP=$yasmexe
AR=$ar AR=$ar
RANLIB=$ranlib RANLIB=$ranlib
CP=cp -p
LN_S=$ln_s LN_S=$ln_s
STRIP=$strip
CPPFLAGS=$CPPFLAGS CPPFLAGS=$CPPFLAGS
CFLAGS=$CFLAGS CFLAGS=$CFLAGS
ASFLAGS=$ASFLAGS ASFLAGS=$ASFLAGS
......
...@@ -60,7 +60,6 @@ distclean:: clean ...@@ -60,7 +60,6 @@ distclean:: clean
install-lib$(NAME)-shared: $(SUBDIR)$(SLIBNAME) install-lib$(NAME)-shared: $(SUBDIR)$(SLIBNAME)
$(Q)mkdir -p "$(SHLIBDIR)" $(Q)mkdir -p "$(SHLIBDIR)"
$$(INSTALL) -m 755 $$< "$(SHLIBDIR)/$(SLIBNAME_WITH_VERSION)" $$(INSTALL) -m 755 $$< "$(SHLIBDIR)/$(SLIBNAME_WITH_VERSION)"
$$(STRIP) "$(SHLIBDIR)/$(SLIBNAME_WITH_VERSION)"
$(Q)cd "$(SHLIBDIR)" && \ $(Q)cd "$(SHLIBDIR)" && \
$(LN_S) $(SLIBNAME_WITH_VERSION) $(SLIBNAME_WITH_MAJOR) $(LN_S) $(SLIBNAME_WITH_VERSION) $(SLIBNAME_WITH_MAJOR)
$(Q)cd "$(SHLIBDIR)" && \ $(Q)cd "$(SHLIBDIR)" && \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment