root/manjaro-tools
1
0
Fork 0
forked from mirrored-repos/manjaro-tools
Code Pull requests Activity

Fix #48

Browse source
This commit is contained in:
Philip 2015-02-27 22:40:58 +01:00
parent a1f4105ec1
commit f641038755
2 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bin/buildpkg.in
View file

@ -151,7 +151,7 @@ done
if [[ "${arch}" == 'multilib' ]]; then if [[ "${arch}" == 'multilib' ]]; then
pacman_conf_arch='multilib' pacman_conf_arch='multilib'
base_packages+=('multilib-devel') base_packages+=('multilib-devel lib32-mesa')
work_dir=${chroots_pkg}/${branch}/${arch} work_dir=${chroots_pkg}/${branch}/${arch}
cache_dir_pkg=${cache_dir}/${branch}/${arch} cache_dir_pkg=${cache_dir}/${branch}/${arch}
arch='x86_64' arch='x86_64'

5
lib/util-pkg.sh
View file

@ -56,10 +56,6 @@ blacklist_pkg(){
done done
} }
set_mhwd_multilib(){
chroot-run $1/root mhwd-gpu --setgl mesa
}
prepare_cachedir(){ prepare_cachedir(){
prepare_dir "${cache_dir_pkg}" prepare_dir "${cache_dir_pkg}"
chown -R "${OWNER}:users" "${cache_dir_pkg}" chown -R "${OWNER}:users" "${cache_dir_pkg}"
@ -97,7 +93,6 @@ make_pkg(){
for p in ${blacklist_trigger[@]}; do for p in ${blacklist_trigger[@]}; do
[[ $1 == $p ]] && blacklist_pkg "${work_dir}" [[ $1 == $p ]] && blacklist_pkg "${work_dir}"
done done
# ${is_multilib} && set_mhwd_multilib "${work_dir}"
setarch "${arch}" \ setarch "${arch}" \
mkchrootpkg ${mkchrootpkg_args[*]} -- ${makepkg_args[*]} || eval "$2" mkchrootpkg ${mkchrootpkg_args[*]} -- ${makepkg_args[*]} || eval "$2"
source PKGBUILD source PKGBUILD