generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove installstrip in favor of explicit strip; better for cross-compilation.

Browse Source 
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:
Ramiro Polla 2007-01-25 12:29:48 +00:00 committed by Diego Biurrun
parent 7a7be12663
commit ca3798dc22
3 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -124,7 +124,7 @@ else
install-progs: $(PROGS) install-progs: $(PROGS)
endif endif
install -d "$(bindir)" install -d "$(bindir)"
install -c $(INSTALLSTRIP) -m 755 $(PROGS) "$(bindir)" install -c -m 755 $(PROGS) "$(bindir)"
# Create the Windows installer. # Create the Windows installer.
wininstaller: all install wininstaller: all install

4
common.mak
View File

@ -63,8 +63,8 @@ install-libs: $(INSTLIBTARGETS)
install-lib-shared: $(SLIBNAME) install-lib-shared: $(SLIBNAME)
install -d "$(shlibdir)" install -d "$(shlibdir)"
install $(INSTALLSTRIP) -m 755 $(SLIBNAME) \ install -m 755 $(SLIBNAME) "$(shlibdir)/$(SLIBNAME_WITH_VERSION)"
"$(shlibdir)/$(SLIBNAME_WITH_VERSION)" $(STRIP) "$(shlibdir)/$(SLIBNAME_WITH_VERSION)"
cd "$(shlibdir)" && \ cd "$(shlibdir)" && \
ln -sf $(SLIBNAME_WITH_VERSION) $(SLIBNAME_WITH_MAJOR) ln -sf $(SLIBNAME_WITH_VERSION) $(SLIBNAME_WITH_MAJOR)
cd "$(shlibdir)" && \ cd "$(shlibdir)" && \

5
configure vendored
View File

@ -668,7 +668,6 @@ optimize="yes"
debug="yes" debug="yes"
extrawarnings="no" extrawarnings="no"
dostrip="yes" dostrip="yes"
installstrip="-s"
extralibs="-lm" extralibs="-lm"
bigendian="no" bigendian="no"
vhook="default" vhook="default"
@ -810,7 +809,6 @@ dv1394="no"
extralibs="-lpoll -lgnugetopt -lm" extralibs="-lpoll -lgnugetopt -lm"
make="gmake" make="gmake"
strip="strip -d" strip="strip -d"
installstrip=""
;; ;;
Darwin) Darwin)
cc="cc" 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/$@' VHOOKSHFLAGS='-dynamiclib -Wl,-single_module -flat_namespace -undefined suppress -Wl,-install_name,$(shlibdir)/vhook/$@'
extralibs="" extralibs=""
strip="strip -x" strip="strip -x"
installstrip=""
FFLDFLAGS="-Wl,-dynamic,-search_paths_first" FFLDFLAGS="-Wl,-dynamic,-search_paths_first"
SLIBSUF=".dylib" SLIBSUF=".dylib"
SLIBNAME_WITH_VERSION='$(SLIBPREF)$(NAME).$(LIBVERSION)$(SLIBSUF)' SLIBNAME_WITH_VERSION='$(SLIBPREF)$(NAME).$(LIBVERSION)$(SLIBSUF)'
@ -1914,10 +1911,8 @@ echo "AR=$ar" >> config.mak
echo "RANLIB=$ranlib" >> config.mak echo "RANLIB=$ranlib" >> config.mak
if test "$dostrip" = "yes" ; then if test "$dostrip" = "yes" ; then
echo "STRIP=$strip" >> config.mak echo "STRIP=$strip" >> config.mak
echo "INSTALLSTRIP=$installstrip" >> config.mak
else else
echo "STRIP=echo ignoring strip" >> config.mak echo "STRIP=echo ignoring strip" >> config.mak
echo "INSTALLSTRIP=" >> config.mak
fi fi
echo "OPTFLAGS=$CFLAGS" >> config.mak echo "OPTFLAGS=$CFLAGS" >> config.mak