[SCM] libav/experimental: Install generated .lib files in shlibdir on MinGW. patch by Ramiro Polla, ramiro lisha.ufsc br
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 15:54:25 UTC 2013
The following commit has been merged in the experimental branch:
commit 8fbec4f4d0e10dec451fce5f8f62908d4896170a
Author: Ramiro Polla <ramiro at lisha.ufsc.br>
Date: Fri Dec 22 05:29:14 2006 +0000
Install generated .lib files in shlibdir on MinGW.
patch by Ramiro Polla, ramiro lisha.ufsc br
Originally committed as revision 7356 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/common.mak b/common.mak
index d4a8dca..8fb66f6 100644
--- a/common.mak
+++ b/common.mak
@@ -69,6 +69,7 @@ install-lib-shared: $(SLIBNAME)
ln -sf $(SLIBNAME_WITH_VERSION) $(SLIBNAME_WITH_MAJOR)
cd "$(shlibdir)" && \
ln -sf $(SLIBNAME_WITH_VERSION) $(SLIBNAME)
+ $(SLIB_INSTALL_EXTRA_CMD)
install-lib-static: $(LIB)
install -d "$(libdir)"
diff --git a/configure b/configure
index 5b60972..731d896 100755
--- a/configure
+++ b/configure
@@ -1092,6 +1092,7 @@ EOF
SLIBNAME_WITH_VERSION='$(SLIBPREF)$(NAME)-$(LIBVERSION)$(SLIBSUF)'
SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(NAME)-$(LIBMAJOR)$(SLIBSUF)'
SLIB_EXTRA_CMD="-lib /machine:i386 /def:\$(@:${SLIBSUF}=.def)"
+ SLIB_INSTALL_EXTRA_CMD="-install -m 644 \$(SLIBNAME_WITH_MAJOR:\$(SLIBSUF)=.lib) \"${shlibdir}/\$(SLIBNAME_WITH_MAJOR:\$(SLIBSUF)=.lib)\""
SHFLAGS="-shared -Wl,--output-def,\$(@:${SLIBSUF}=.def),--out-implib,lib\$(SLIBNAME:\$(SLIBSUF)=.dll.a) -Wl,--enable-runtime-pseudo-reloc"
fi
@@ -1945,6 +1946,7 @@ if test "$lshared" = "yes" ; then
echo "SLIBNAME_WITH_VERSION=${SLIBNAME_WITH_VERSION}" >> config.mak
echo "SLIBNAME_WITH_MAJOR=${SLIBNAME_WITH_MAJOR}" >> config.mak
echo "SLIB_EXTRA_CMD=${SLIB_EXTRA_CMD}" >> config.mak
+ echo "SLIB_INSTALL_EXTRA_CMD=${SLIB_INSTALL_EXTRA_CMD}" >> config.mak
fi
echo "LIB_INSTALL_EXTRA_CMD=${LIB_INSTALL_EXTRA_CMD}" >> config.mak
echo "EXTRALIBS=$extralibs" >> config.mak
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list