mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
ldconfig as config.mak variable patch by (Jacob Meuser: jakemsr, jakemsr com)
Originally committed as revision 4303 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
bb4c2140c2
commit
f39e56a84b
3
configure
vendored
3
configure
vendored
@ -197,6 +197,7 @@ ffserver="yes"
|
||||
ffplay="yes"
|
||||
LDFLAGS=-Wl,--warn-common
|
||||
FFSLDFLAGS=-Wl,-E
|
||||
LDCONFIG="ldconfig"
|
||||
LIBPREF="lib"
|
||||
LIBSUF=".a"
|
||||
SLIBPREF="lib"
|
||||
@ -273,6 +274,7 @@ dv1394="no"
|
||||
make="gmake"
|
||||
CFLAGS="$CFLAGS \$(PIC)"
|
||||
LDFLAGS="$LDFLAGS -export-dynamic -pthread"
|
||||
LDCONFIG="ldconfig -m \$(libdir)"
|
||||
extralibs="$extralibs -lossaudio"
|
||||
;;
|
||||
FreeBSD)
|
||||
@ -1205,6 +1207,7 @@ fi
|
||||
echo "OPTFLAGS=$CFLAGS" >> config.mak
|
||||
echo "SHCFLAGS=$SHCFLAGS">>config.mak
|
||||
echo "LDFLAGS=$LDFLAGS" >> config.mak
|
||||
echo "LDCONFIG=$LDCONFIG" >> config.mak
|
||||
echo "FFSLDFLAGS=$FFSLDFLAGS" >> config.mak
|
||||
echo "SHFLAGS=$SHFLAGS" >> config.mak
|
||||
echo "BUILDSUF=$BUILDSUF" >> config.mak
|
||||
|
@ -465,7 +465,7 @@ else
|
||||
install -d $(libdir)
|
||||
install $(INSTALLSTRIP) -m 755 $(SLIB) $(libdir)/libavcodec-$(VERSION).so
|
||||
ln -sf libavcodec-$(VERSION).so $(libdir)/libavcodec.so
|
||||
ldconfig || true
|
||||
$(LDCONFIG) || true
|
||||
endif
|
||||
ifeq ($(CONFIG_PP),yes)
|
||||
$(MAKE) -C libpostproc $@
|
||||
|
@ -61,7 +61,7 @@ else
|
||||
ln -sf $(SPPLIB).$(SPPVERSION) $(libdir)/$(SPPLIB).$(SPPMAJOR)
|
||||
install -d $(libdir)/pkgconfig
|
||||
install -m 644 ../../libpostproc.pc $(libdir)/pkgconfig
|
||||
ldconfig || true
|
||||
$(LDCONFIG) || true
|
||||
endif
|
||||
endif
|
||||
mkdir -p $(prefix)/include/postproc
|
||||
|
@ -111,7 +111,7 @@ else
|
||||
install -d $(libdir)
|
||||
install $(INSTALLSTRIP) -m 755 $(SLIB) $(libdir)/libavformat-$(VERSION).so
|
||||
ln -sf libavformat-$(VERSION).so $(libdir)/libavformat.so
|
||||
ldconfig || true
|
||||
$(LDCONFIG) || true
|
||||
endif
|
||||
else
|
||||
install:
|
||||
|
Loading…
Reference in New Issue
Block a user