mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
do not run ldconfig after installing shared libraries
Originally committed as revision 12121 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
b6f5794597
commit
b147ec08c3
3
Makefile
3
Makefile
@ -166,9 +166,6 @@ install-libs:
|
||||
$(MAKE) -C libavdevice install-libs
|
||||
$(MAKE-$(CONFIG_PP)) -C libpostproc install-libs
|
||||
$(MAKE-$(CONFIG_SWSCALER)) -C libswscale install-libs
|
||||
ifeq ($(BUILD_SHARED),yes)
|
||||
-$(LDCONFIG)
|
||||
endif
|
||||
|
||||
install-headers:
|
||||
$(MAKE) -C libavutil install-headers
|
||||
|
4
configure
vendored
4
configure
vendored
@ -924,7 +924,6 @@ SHFLAGS='-shared -Wl,-soname,$@'
|
||||
VHOOKSHFLAGS='$(SHFLAGS)'
|
||||
LDLATEFLAGS='-Wl,-rpath-link,\$(BUILD_ROOT)/libavcodec -Wl,-rpath-link,\$(BUILD_ROOT)/libavformat -Wl,-rpath-link,\$(BUILD_ROOT)/libavutil'
|
||||
FFSERVERLDFLAGS=-Wl,-E
|
||||
LDCONFIG="ldconfig"
|
||||
LIBPREF="lib"
|
||||
LIBSUF=".a"
|
||||
FULLNAME='$(NAME)$(BUILDSUF)'
|
||||
@ -1160,7 +1159,6 @@ case $targetos in
|
||||
add_cflags "-fno-expensive-optimizations"
|
||||
;;
|
||||
esac
|
||||
LDCONFIG="echo ignoring ldconfig"
|
||||
SHFLAGS=-nostart
|
||||
# enable BeOS things
|
||||
enable audio_beos
|
||||
@ -1185,7 +1183,6 @@ case $targetos in
|
||||
openbsd)
|
||||
disable need_memalign
|
||||
LIBOBJFLAGS='$(PIC)'
|
||||
LDCONFIG='ldconfig -m $(SHLIBDIR)'
|
||||
SHFLAGS='-shared'
|
||||
SLIBNAME='$(SLIBPREF)$(FULLNAME)$(SLIBSUF).$(LIBVERSION)'
|
||||
SLIBNAME_WITH_VERSION='$(SLIBNAME)'
|
||||
@ -1963,7 +1960,6 @@ echo "MAKE=$make" >> config.mak
|
||||
echo "CC=$cc" >> config.mak
|
||||
echo "AR=$ar" >> config.mak
|
||||
echo "RANLIB=$ranlib" >> config.mak
|
||||
echo "LDCONFIG=$LDCONFIG" >> config.mak
|
||||
echo "LN_S=$ln_s" >> config.mak
|
||||
enabled dostrip &&
|
||||
echo "STRIP=$strip" >> config.mak ||
|
||||
|
Loading…
Reference in New Issue
Block a user