Commit b147ec08 authored by Måns Rullgård's avatar Måns Rullgård

do not run ldconfig after installing shared libraries

Originally committed as revision 12121 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent b6f57945
...@@ -166,9 +166,6 @@ install-libs: ...@@ -166,9 +166,6 @@ install-libs:
$(MAKE) -C libavdevice install-libs $(MAKE) -C libavdevice install-libs
$(MAKE-$(CONFIG_PP)) -C libpostproc install-libs $(MAKE-$(CONFIG_PP)) -C libpostproc install-libs
$(MAKE-$(CONFIG_SWSCALER)) -C libswscale install-libs $(MAKE-$(CONFIG_SWSCALER)) -C libswscale install-libs
ifeq ($(BUILD_SHARED),yes)
-$(LDCONFIG)
endif
install-headers: install-headers:
$(MAKE) -C libavutil install-headers $(MAKE) -C libavutil install-headers
......
...@@ -924,7 +924,6 @@ SHFLAGS='-shared -Wl,-soname,$@' ...@@ -924,7 +924,6 @@ SHFLAGS='-shared -Wl,-soname,$@'
VHOOKSHFLAGS='$(SHFLAGS)' VHOOKSHFLAGS='$(SHFLAGS)'
LDLATEFLAGS='-Wl,-rpath-link,\$(BUILD_ROOT)/libavcodec -Wl,-rpath-link,\$(BUILD_ROOT)/libavformat -Wl,-rpath-link,\$(BUILD_ROOT)/libavutil' LDLATEFLAGS='-Wl,-rpath-link,\$(BUILD_ROOT)/libavcodec -Wl,-rpath-link,\$(BUILD_ROOT)/libavformat -Wl,-rpath-link,\$(BUILD_ROOT)/libavutil'
FFSERVERLDFLAGS=-Wl,-E FFSERVERLDFLAGS=-Wl,-E
LDCONFIG="ldconfig"
LIBPREF="lib" LIBPREF="lib"
LIBSUF=".a" LIBSUF=".a"
FULLNAME='$(NAME)$(BUILDSUF)' FULLNAME='$(NAME)$(BUILDSUF)'
...@@ -1160,7 +1159,6 @@ case $targetos in ...@@ -1160,7 +1159,6 @@ case $targetos in
add_cflags "-fno-expensive-optimizations" add_cflags "-fno-expensive-optimizations"
;; ;;
esac esac
LDCONFIG="echo ignoring ldconfig"
SHFLAGS=-nostart SHFLAGS=-nostart
# enable BeOS things # enable BeOS things
enable audio_beos enable audio_beos
...@@ -1185,7 +1183,6 @@ case $targetos in ...@@ -1185,7 +1183,6 @@ case $targetos in
openbsd) openbsd)
disable need_memalign disable need_memalign
LIBOBJFLAGS='$(PIC)' LIBOBJFLAGS='$(PIC)'
LDCONFIG='ldconfig -m $(SHLIBDIR)'
SHFLAGS='-shared' SHFLAGS='-shared'
SLIBNAME='$(SLIBPREF)$(FULLNAME)$(SLIBSUF).$(LIBVERSION)' SLIBNAME='$(SLIBPREF)$(FULLNAME)$(SLIBSUF).$(LIBVERSION)'
SLIBNAME_WITH_VERSION='$(SLIBNAME)' SLIBNAME_WITH_VERSION='$(SLIBNAME)'
...@@ -1963,7 +1960,6 @@ echo "MAKE=$make" >> config.mak ...@@ -1963,7 +1960,6 @@ echo "MAKE=$make" >> config.mak
echo "CC=$cc" >> config.mak echo "CC=$cc" >> config.mak
echo "AR=$ar" >> config.mak echo "AR=$ar" >> config.mak
echo "RANLIB=$ranlib" >> config.mak echo "RANLIB=$ranlib" >> config.mak
echo "LDCONFIG=$LDCONFIG" >> config.mak
echo "LN_S=$ln_s" >> config.mak echo "LN_S=$ln_s" >> config.mak
enabled dostrip && enabled dostrip &&
echo "STRIP=$strip" >> config.mak || echo "STRIP=$strip" >> config.mak ||
......
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