From 41f5a67f9738a66b4a480ffe561c8a70eb364d31 Mon Sep 17 00:00:00 2001 From: Alexey Pavlov Date: Fri, 17 Nov 2017 08:14:11 +0300 Subject: [PATCH] rhash: Fix creating symlinks during install --- rhash/002-fix-symlinks.patch | 13 +++++++++++++ rhash/PKGBUILD | 9 ++++++--- 2 files changed, 19 insertions(+), 3 deletions(-) create mode 100644 rhash/002-fix-symlinks.patch diff --git a/rhash/002-fix-symlinks.patch b/rhash/002-fix-symlinks.patch new file mode 100644 index 00000000..c19a9a17 --- /dev/null +++ b/rhash/002-fix-symlinks.patch @@ -0,0 +1,13 @@ +--- rhash-1.3.5/Makefile.orig 2017-11-17 07:54:50.450792800 +0300 ++++ rhash-1.3.5/Makefile 2017-11-17 07:56:16.689351900 +0300 +@@ -130,8 +130,8 @@ + + # dependencies should be properly set, otherwise 'make -j' can fail + install-symlinks: mkdir-bin install-man +- for f in $(SYMLINKS); do ln -fs rhash $(DESTDIR)$(BINDIR)/$$f; done +- cd $(DESTDIR)$(MANDIR)/man1 && for f in $(SYMLINKS); do ln -fs rhash.1* $$f.1; done ++ for f in $(SYMLINKS); do cp -f rhash.exe $(DESTDIR)$(BINDIR)/$$f.exe; done ++ cd $(DESTDIR)$(MANDIR)/man1 && for f in $(SYMLINKS); do cp -f rhash.1* $$f.1; done + + uninstall-binary: + rm -f $(DESTDIR)$(BINDIR)/$(PROGNAME) diff --git a/rhash/PKGBUILD b/rhash/PKGBUILD index f07a4a63..eda00e1e 100644 --- a/rhash/PKGBUILD +++ b/rhash/PKGBUILD @@ -8,10 +8,12 @@ url='http://rhash.anz.ru/?l=en' license=('custom' 'MIT') arch=('i686' 'x86_64') source=("https://downloads.sourceforge.net/rhash/rhash-$pkgver-src.tar.gz" - 001-mingw-cygwin-msys.patch) + 001-mingw-cygwin-msys.patch + 002-fix-symlinks.patch) makedepends=('openssl-devel') sha256sums=('98e0688acae29e68c298ffbcdbb0f838864105f9b2bd8857980664435b1f1f2e' - '6d9cffe4dc72ee88df9f4364586c4d7c9f8a295a482abc26dd709bafc5af6d11') + '6d9cffe4dc72ee88df9f4364586c4d7c9f8a295a482abc26dd709bafc5af6d11' + '8d1c0c742c2beb95dbb465e2936820429739384a63131e82c1d95d528f74e382') _make_params="CC=/usr/bin/gcc AR=/usr/bin/ar IS_WIN=yes DLLNAME_PREFIX=msys- ADDCFLAGS=-DOPENSSL_RUNTIME" @@ -38,7 +40,8 @@ del_file_exists() { prepare() { cd ${srcdir}/RHash-${pkgver} apply_patch_with_msg \ - 001-mingw-cygwin-msys.patch + 001-mingw-cygwin-msys.patch \ + 002-fix-symlinks.patch } build() {