diff options
| author | Erich Eckner <git@eckner.net> | 2019-05-15 11:15:43 +0200 |
|---|---|---|
| committer | Erich Eckner <git@eckner.net> | 2019-05-15 11:15:43 +0200 |
| commit | 2bc3cd728f07326f68bcb0ed2feff004dbb1f9e4 (patch) | |
| tree | b2db060b6819f2f3107d4a5d92142339cecf16bc /core/pacman/install-dependencies-simultanously.patch | |
| parent | 075be5b19a39062f08c952142edba1d828236263 (diff) | |
| download | packages-2bc3cd728f07326f68bcb0ed2feff004dbb1f9e4.tar.xz | |
core/pacman: include our patches for simultanously installing the dependencies in makepkg and for mangling "i686" to "pentium4" when "Architecture = auto" is set in pacman's config
Diffstat (limited to 'core/pacman/install-dependencies-simultanously.patch')
| -rw-r--r-- | core/pacman/install-dependencies-simultanously.patch | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/core/pacman/install-dependencies-simultanously.patch b/core/pacman/install-dependencies-simultanously.patch new file mode 100644 index 00000000..07e0e404 --- /dev/null +++ b/core/pacman/install-dependencies-simultanously.patch @@ -0,0 +1,28 @@ +diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in +index 4d9948ec..eb2a19ba 100644 +--- a/scripts/makepkg.sh.in ++++ b/scripts/makepkg.sh.in +@@ -1398,18 +1398,18 @@ else + fi + deperr=0 + +- msg "$(gettext "Checking runtime dependencies...")" +- resolve_deps ${depends[@]} || deperr=1 +- + if (( RMDEPS && INSTALL )); then ++ msg "$(gettext "Checking runtime dependencies...")" ++ resolve_deps ${depends[@]} || deperr=1 ++ + original_pkglist=($(run_pacman -Qq)) # required by remove_dep + fi + + msg "$(gettext "Checking buildtime dependencies...")" + if (( CHECKFUNC )); then +- resolve_deps "${makedepends[@]}" "${checkdepends[@]}" || deperr=1 ++ resolve_deps "${depends[@]}" "${makedepends[@]}" "${checkdepends[@]}" || deperr=1 + else +- resolve_deps "${makedepends[@]}" || deperr=1 ++ resolve_deps "${depends[@]}" "${makedepends[@]}" || deperr=1 + fi + + if (( RMDEPS )); then |