[FFmpeg-cvslog] Remove support for stripping executables
Mans Rullgard
git at videolan.org
Wed Mar 30 03:26:00 CEST 2011
ffmpeg | branch: master | Mans Rullgard <mans at mansr.com> | Tue Mar 29 20:50:26 2011 +0100| [e0be794a71be25a350f68287ee291b4942bcb7d8] | committer: 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: Mans Rullgard <mans at mansr.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e0be794a71be25a350f68287ee291b4942bcb7d8
---
Makefile | 14 ++++----------
common.mak | 2 +-
configure | 16 +---------------
subdir.mak | 1 -
4 files changed, 6 insertions(+), 27 deletions(-)
diff --git a/Makefile b/Makefile
index 2d97c8b..0bf04d1 100644
--- a/Makefile
+++ b/Makefile
@@ -10,7 +10,6 @@ PROGS-$(CONFIG_FFPROBE) += ffprobe
PROGS-$(CONFIG_FFSERVER) += ffserver
PROGS := $(PROGS-yes:%=%$(EXESUF))
-PROGS_G = $(PROGS-yes:%=%_g$(EXESUF))
OBJS = $(PROGS-yes:%=%.o) cmdutils.o
MANPAGES = $(PROGS-yes:%=doc/%.1)
PODPAGES = $(PROGS-yes:%=doc/%.pod)
@@ -21,7 +20,6 @@ HOSTPROGS := $(TESTTOOLS:%=tests/%)
BASENAMES = ffmpeg ffplay ffprobe ffserver
ALLPROGS = $(BASENAMES:%=%$(EXESUF))
-ALLPROGS_G = $(BASENAMES:%=%_g$(EXESUF))
ALLMANPAGES = $(BASENAMES:%=%.1)
FFLIBS-$(CONFIG_AVDEVICE) += avdevice
@@ -53,10 +51,6 @@ INSTALL_PROGS_TARGETS-$(CONFIG_SHARED) = install-libs
all: $(FF_DEP_LIBS) $(PROGS) $(ALL_TARGETS-yes)
-$(PROGS): %$(EXESUF): %_g$(EXESUF)
- $(CP) $< $@
- $(STRIP) $@
-
config.h: .config
.config: $(wildcard $(FFLIBS:%=$(SRC_DIR)/lib%/all*.c))
@-tput bold 2>/dev/null
@@ -80,10 +74,10 @@ endef
$(foreach D,$(FFLIBS),$(eval $(call DOSUBDIR,lib$(D))))
-ffplay_g$(EXESUF): FF_EXTRALIBS += $(SDL_LIBS)
-ffserver_g$(EXESUF): FF_LDFLAGS += $(FFSERVERLDFLAGS)
+ffplay$(EXESUF): FF_EXTRALIBS += $(SDL_LIBS)
+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)
tools/%$(EXESUF): tools/%.o
@@ -165,7 +159,7 @@ testclean:
$(RM) $(TESTTOOLS:%=tests/%$(HOSTEXESUF))
clean:: testclean
- $(RM) $(ALLPROGS) $(ALLPROGS_G)
+ $(RM) $(ALLPROGS)
$(RM) $(CLEANSUFFIXES)
$(RM) doc/*.html doc/*.pod doc/*.1
$(RM) $(TOOLS)
diff --git a/common.mak b/common.mak
index 3d1a129..6daf77c 100644
--- a/common.mak
+++ b/common.mak
@@ -21,7 +21,7 @@ endif
ifndef V
Q = @
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
MSG = $@
M = @$(call ECHO,$(TAG),$@);
diff --git a/configure b/configure
index 2634cef..fab4f2b 100755
--- a/configure
+++ b/configure
@@ -242,7 +242,6 @@ Developer options (useful when working on Libav itself):
--enable-debug=LEVEL set the debug level [$debuglevel]
--disable-optimizations disable compiler optimizations
--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
\$FATE_SAMPLES at make invocation time.
@@ -1142,7 +1141,6 @@ CMDLINE_SELECT="
extra_warnings
logging
optimizations
- stripping
symver
yasm
"
@@ -1180,7 +1178,6 @@ CMDLINE_SET="
pkg_config
samples
source_path
- strip
sysinclude
sysroot
target_exec
@@ -1608,7 +1605,6 @@ nm_default="nm"
objformat="elf"
pkg_config_default=pkg-config
ranlib="ranlib"
-strip_default="strip"
yasmexe="yasm"
nogas=":"
@@ -1641,7 +1637,6 @@ enable network
enable optimizations
enable protocols
enable static
-enable stripping
enable swscale
enable swscale_alpha
@@ -1818,11 +1813,10 @@ cc_default="${cross_prefix}${cc_default}"
nm_default="${cross_prefix}${nm_default}"
pkg_config_default="${cross_prefix}${pkg_config_default}"
ranlib="${cross_prefix}${ranlib}"
-strip_default="${cross_prefix}${strip_default}"
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
set_default host_cc
@@ -2381,7 +2375,6 @@ case $target_os in
;;
bsd/os)
add_extralibs -lpoll -lgnugetopt
- strip="strip -d"
;;
darwin)
enable malloc_aligned
@@ -2389,7 +2382,6 @@ case $target_os in
enabled ppc && add_asflags -force_cpusubtype_ALL
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
- strip="${strip} -x"
add_ldflags -Wl,-dynamic,-search_paths_first
SLIBSUF=".dylib"
SLIBNAME_WITH_VERSION='$(SLIBPREF)$(FULLNAME).$(LIBVERSION)$(SLIBSUF)'
@@ -2459,7 +2451,6 @@ case $target_os in
ranlib="echo ignoring ranlib"
;;
os/2*)
- strip="lxlite -CS"
ln_s="cp -f"
add_ldflags -Zomf -Zbin-files -Zargs-wild -Zmap
SHFLAGS='$(SUBDIR)$(NAME).def -Zdll -Zomf'
@@ -3110,7 +3101,6 @@ if enabled sparc; then
echo "VIS enabled ${vis-no}"
fi
echo "debug symbols ${debug-no}"
-echo "strip symbols ${stripping-no}"
echo "optimizations ${optimizations-no}"
echo "static ${static-no}"
echo "shared ${shared-no}"
@@ -3204,8 +3194,6 @@ if enabled source_path_used; then
map 'test -f "$source_path/$v" && $ln_s "$source_path/$v" $v' $FILES
fi
-enabled stripping || strip="echo skipping strip"
-
config_files="$TMPH config.mak"
cat > config.mak <<EOF
@@ -3233,9 +3221,7 @@ YASM=$yasmexe
YASMDEP=$yasmexe
AR=$ar
RANLIB=$ranlib
-CP=cp -p
LN_S=$ln_s
-STRIP=$strip
CPPFLAGS=$CPPFLAGS
CFLAGS=$CFLAGS
ASFLAGS=$ASFLAGS
diff --git a/subdir.mak b/subdir.mak
index 8a407fe..7fdeddc 100644
--- a/subdir.mak
+++ b/subdir.mak
@@ -60,7 +60,6 @@ distclean:: clean
install-lib$(NAME)-shared: $(SUBDIR)$(SLIBNAME)
$(Q)mkdir -p "$(SHLIBDIR)"
$$(INSTALL) -m 755 $$< "$(SHLIBDIR)/$(SLIBNAME_WITH_VERSION)"
- $$(STRIP) "$(SHLIBDIR)/$(SLIBNAME_WITH_VERSION)"
$(Q)cd "$(SHLIBDIR)" && \
$(LN_S) $(SLIBNAME_WITH_VERSION) $(SLIBNAME_WITH_MAJOR)
$(Q)cd "$(SHLIBDIR)" && \
More information about the ffmpeg-cvslog
mailing list