From baa3a937815c8bcd47b84cd4a3b450705197b27a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5ns=20Rullg=C3=A5rd?= <mans@mansr.com> Date: Thu, 11 May 2006 20:36:00 +0000 Subject: [PATCH] Create shared libraries using versioned filenames and add -rpath-link to LDFLAGS so linker finds them when using --as-needed (which is default in some installations). Using --as-needed is generally a good thing, so add that explicitly as well. Originally committed as revision 5362 to svn://svn.ffmpeg.org/ffmpeg/trunk --- common.mak | 5 ++++- configure | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/common.mak b/common.mak index 24ccaedb823..94272c58131 100644 --- a/common.mak +++ b/common.mak @@ -31,7 +31,10 @@ $(LIB): $(STATIC_OBJS) $(AR) rc $@ $^ $(EXTRAOBJS) $(RANLIB) $@ -$(SLIBNAME): $(SHARED_OBJS) +$(SLIBNAME): $(SLIBNAME_WITH_MAJOR) + ln -sf $^ $@ + +$(SLIBNAME_WITH_MAJOR): $(SHARED_OBJS) $(CC) $(SHFLAGS) $(LDFLAGS) -o $@ $^ $(EXTRALIBS) $(EXTRAOBJS) ifeq ($(CONFIG_WIN32),yes) -lib /machine:i386 /def:$(@:.dll=.def) diff --git a/configure b/configure index 4ff62c7f972..f2b8bacd7bd 100755 --- a/configure +++ b/configure @@ -228,7 +228,7 @@ vhook="default" dlfcn="no" dlopen="no" mpegaudio_hp="yes" -SHFLAGS='-shared -Wl,-soname,$@.$(LIBMAJOR)' +SHFLAGS='-shared -Wl,-soname,$@' netserver="no" need_inet_aton="no" protocols="yes" @@ -383,7 +383,7 @@ cygwin="yes" EXESUF=".exe" ;; Linux) -LDFLAGS="$LDFLAGS -rdynamic" +LDFLAGS="$LDFLAGS -rdynamic -Wl,--as-needed -Wl,-rpath-link,\$(BUILD_ROOT)/libavcodec -Wl,-rpath-link,\$(BUILD_ROOT)/libavformat -Wl,-rpath-link,\$(BUILD_ROOT)/libavutil" ;; IRIX*) ranlib="echo ignoring ranlib" -- GitLab