highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

do not run ldconfig after installing shared libraries

Browse Source 
Originally committed as revision 12121 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Måns Rullgård
2008-02-16 14:13:23 +00:00
parent b6f5794597
commit b147ec08c3
2 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@@ -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

4
configure vendored
View File

@@ -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
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
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
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 ||