Skip to content

Commit

Permalink
pacman: Fix make race condition
Browse files Browse the repository at this point in the history
  • Loading branch information
Alexpux committed Jul 30, 2018
1 parent 6c185b9 commit 37603ca
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 1 deletion.
16 changes: 16 additions & 0 deletions pacman/0050-fix-make-target-dependencies.patch
@@ -0,0 +1,16 @@
--- pacman-5.1.1/scripts/Makefile.am.orig 2018-07-30 09:17:05.342738900 +0300
+++ pacman-5.1.1/scripts/Makefile.am 2018-07-30 09:17:33.625588500 +0300
@@ -227,11 +227,11 @@
$(srcdir)/library/output_format.sh \
$(srcdir)/library/utils_fixed_path.sh

-repo-remove: $(srcdir)/repo-add.sh.in
+repo-remove: repo-add
$(AM_V_at)$(RM) repo-remove
$(AM_V_at)$(LN_S) repo-add repo-remove

-repo-elephant: $(srcdir)/repo-add.sh.in
+repo-elephant: repo-add
$(AM_V_at)$(RM) repo-elephant
$(AM_V_at)$(LN_S) repo-add repo-elephant

5 changes: 4 additions & 1 deletion pacman/PKGBUILD
Expand Up @@ -4,7 +4,7 @@

pkgname=pacman
pkgver=5.1.1
pkgrel=1
pkgrel=2
pkgdesc="A library-based package manager with dependency support (MSYS2 port)"
arch=('i686' 'x86_64')
url="https://www.archlinux.org/pacman/"
Expand Down Expand Up @@ -64,6 +64,7 @@ source=(https://sources.archlinux.org/other/pacman/${pkgname}-${pkgver}.tar.gz{,
"0007-exe-interp-ignore-file-conflict.patch"
"0008-answer-yes-by-default.patch"
"0009-msys-use-pipe-instead-socket.patch"
"0050-fix-make-target-dependencies.patch"
"0100-contrib.patch")
sha256sums=('be04b9162d62d2567e21402dcbabb5bedfdb03909fa5ec6e8568e02ab325bd8d'
'SKIP'
Expand All @@ -83,6 +84,7 @@ sha256sums=('be04b9162d62d2567e21402dcbabb5bedfdb03909fa5ec6e8568e02ab325bd8d'
'52343bbf99da6408950e34dd84319e34724040f866c497c25e36b4ee54030e82'
'e4f6e17af19e17e745a9f1c6b8402f5896229062c82167cb61f8e7d29eda716c'
'9e8fe5ee78192b0407e80ad2e52cb27569c35974b6c26e465e3d55e19c03d108'
'5bd66342aff56343aa5e07dbf997d18cc3dcae691cc7d8f83e94fee12b5b61b8'
'3bd0cd48d608b31d7df564c50e8d31df58dd38cfaaea9ec0fcceb42936486549')

prepare() {
Expand All @@ -97,6 +99,7 @@ prepare() {
patch -p1 -i ${srcdir}/0007-exe-interp-ignore-file-conflict.patch
patch -p1 -i ${srcdir}/0008-answer-yes-by-default.patch
patch -p1 -i ${srcdir}/0009-msys-use-pipe-instead-socket.patch
patch -p1 -i ${srcdir}/0050-fix-make-target-dependencies.patch

autoreconf -fi

Expand Down

0 comments on commit 37603ca

Please sign in to comment.