mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
Remove installstrip in favor of explicit strip; better for cross-compilation.
patch by Ramiro Ribeiro Polla, ramiro lisha.ufsc br Originally committed as revision 7709 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
7a7be12663
commit
ca3798dc22
2
Makefile
2
Makefile
@ -124,7 +124,7 @@ else
|
||||
install-progs: $(PROGS)
|
||||
endif
|
||||
install -d "$(bindir)"
|
||||
install -c $(INSTALLSTRIP) -m 755 $(PROGS) "$(bindir)"
|
||||
install -c -m 755 $(PROGS) "$(bindir)"
|
||||
|
||||
# Create the Windows installer.
|
||||
wininstaller: all install
|
||||
|
@ -63,8 +63,8 @@ install-libs: $(INSTLIBTARGETS)
|
||||
|
||||
install-lib-shared: $(SLIBNAME)
|
||||
install -d "$(shlibdir)"
|
||||
install $(INSTALLSTRIP) -m 755 $(SLIBNAME) \
|
||||
"$(shlibdir)/$(SLIBNAME_WITH_VERSION)"
|
||||
install -m 755 $(SLIBNAME) "$(shlibdir)/$(SLIBNAME_WITH_VERSION)"
|
||||
$(STRIP) "$(shlibdir)/$(SLIBNAME_WITH_VERSION)"
|
||||
cd "$(shlibdir)" && \
|
||||
ln -sf $(SLIBNAME_WITH_VERSION) $(SLIBNAME_WITH_MAJOR)
|
||||
cd "$(shlibdir)" && \
|
||||
|
5
configure
vendored
5
configure
vendored
@ -668,7 +668,6 @@ optimize="yes"
|
||||
debug="yes"
|
||||
extrawarnings="no"
|
||||
dostrip="yes"
|
||||
installstrip="-s"
|
||||
extralibs="-lm"
|
||||
bigendian="no"
|
||||
vhook="default"
|
||||
@ -810,7 +809,6 @@ dv1394="no"
|
||||
extralibs="-lpoll -lgnugetopt -lm"
|
||||
make="gmake"
|
||||
strip="strip -d"
|
||||
installstrip=""
|
||||
;;
|
||||
Darwin)
|
||||
cc="cc"
|
||||
@ -823,7 +821,6 @@ SHFLAGS="-dynamiclib -Wl,-single_module -Wl,-install_name,\$(shlibdir)/\$(SLIBNA
|
||||
VHOOKSHFLAGS='-dynamiclib -Wl,-single_module -flat_namespace -undefined suppress -Wl,-install_name,$(shlibdir)/vhook/$@'
|
||||
extralibs=""
|
||||
strip="strip -x"
|
||||
installstrip=""
|
||||
FFLDFLAGS="-Wl,-dynamic,-search_paths_first"
|
||||
SLIBSUF=".dylib"
|
||||
SLIBNAME_WITH_VERSION='$(SLIBPREF)$(NAME).$(LIBVERSION)$(SLIBSUF)'
|
||||
@ -1914,10 +1911,8 @@ echo "AR=$ar" >> config.mak
|
||||
echo "RANLIB=$ranlib" >> config.mak
|
||||
if test "$dostrip" = "yes" ; then
|
||||
echo "STRIP=$strip" >> config.mak
|
||||
echo "INSTALLSTRIP=$installstrip" >> config.mak
|
||||
else
|
||||
echo "STRIP=echo ignoring strip" >> config.mak
|
||||
echo "INSTALLSTRIP=" >> config.mak
|
||||
fi
|
||||
|
||||
echo "OPTFLAGS=$CFLAGS" >> config.mak
|
||||
|
Loading…
Reference in New Issue
Block a user