From e14503fbc48befacac2cdcd4491e512eb20e36ff Mon Sep 17 00:00:00 2001 From: Alexey Pavlov Date: Thu, 16 Feb 2017 10:23:23 +0300 Subject: [PATCH] mpdecimal: Do not install library twice with different names --- mingw-w64-mpdecimal/PKGBUILD | 2 +- mingw-w64-mpdecimal/msys2-mingw-fixes.patch | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/mingw-w64-mpdecimal/PKGBUILD b/mingw-w64-mpdecimal/PKGBUILD index 384e5c2d25..3a4e83891a 100644 --- a/mingw-w64-mpdecimal/PKGBUILD +++ b/mingw-w64-mpdecimal/PKGBUILD @@ -14,7 +14,7 @@ checkdepends=("wget") source=("http://www.bytereef.org/software/${_realname}/releases/${_realname}-$pkgver.tar.gz" "msys2-mingw-fixes.patch") sha256sums=('83c628b90f009470981cf084c5418329c88b19835d8af3691b930afccb7d79c7' - 'bab84b9edf880cd224d63b96391d9ca9f6953be4a707578517775fbdfae5abef') + '9a49bfe1e67cb51f77c8d211130f7bc7d1150a26385550bcae111f29d5e0d46f') prepare() { cd $srcdir/${_realname}-${pkgver} diff --git a/mingw-w64-mpdecimal/msys2-mingw-fixes.patch b/mingw-w64-mpdecimal/msys2-mingw-fixes.patch index 3ad3c6d10a..72e7a1cc9e 100644 --- a/mingw-w64-mpdecimal/msys2-mingw-fixes.patch +++ b/mingw-w64-mpdecimal/msys2-mingw-fixes.patch @@ -21,8 +21,8 @@ + *-*-mingw*) + LIBSTATIC=libmpdec.a + LIBSOALIAS= -+ LIBSONAME=libmpdec-2.dll -+ LIBSHARED=libmpdec-${PACKAGE_VERSION}.dll ++ LIBSONAME=libmpdec-${PACKAGE_VERSION}.dll ++ LIBSHARED=libmpdec-2.dll + LIBIMPORT=libmpdec.dll.a + IS_WINDOWS=yes + ;; @@ -172,7 +172,7 @@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -35,9 +46,24 @@ +@@ -35,9 +46,23 @@ $(INSTALL) -d -m 755 $(DESTDIR)$(includedir) $(INSTALL) -m 644 libmpdec/mpdecimal.h $(DESTDIR)$(includedir) $(INSTALL) -d -m 755 $(DESTDIR)$(libdir) @@ -183,7 +183,6 @@ +ifeq ($(IS_WINDOWS),yes) + $(INSTALL) -d -m 755 $(DESTDIR)$(bindir) + $(INSTALL) -m 755 libmpdec/$(LIBSHARED) $(DESTDIR)$(bindir) -+ cd $(DESTDIR)$(bindir) && $(LN_S) $(LIBSHARED) $(LIBSONAME) +ifneq ($(LIBSOALIAS),) + cd $(DESTDIR)$(bindir) && $(LN_S) $(LIBSHARED) $(LIBSOALIAS) +endif