root/nix-tools
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

buildpkg: call get_makepkg_conf() before setting target_arch x86_64 for multilib

Browse source
This commit is contained in:
udeved 2016-06-09 12:04:45 +02:00
parent 64244bfda3
commit 722b36fed2
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
bin/buildpkg.in
View file

@ -140,7 +140,6 @@ check_root "$0" "${orig_argv[@]}"
prepare_conf "${target_arch}"
mirrors_conf=$(get_pac_mirrors_conf "${target_branch}")
makepkg_conf=$(get_makepkg_conf "${target_arch}")
mkchroot_args+=(-C ${pacman_conf} -M ${makepkg_conf} -S ${mirrors_conf} -B "${build_mirror}/${target_branch}")

2
lib/util-pkg.sh
View file

@ -55,6 +55,8 @@ prepare_conf(){
work_dir="${chroots_pkg}/${target_branch}/$1"
pkg_dir="${cache_dir_pkg}/${target_branch}/$1"
makepkg_conf=$(get_makepkg_conf "$1")
[[ "$pac_arch" == 'multilib' ]] && target_arch='x86_64'
}