From 1ce3a6b62cb1df2f89ba0bbdd6bf8fe7894e42c5 Mon Sep 17 00:00:00 2001 From: Philip Date: Sat, 28 Feb 2015 00:27:17 +0100 Subject: [PATCH 1/2] [multilib] mhwd needs to been installed on chroot --- bin/buildpkg.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/buildpkg.in b/bin/buildpkg.in index c72ed07..9e1bad6 100644 --- a/bin/buildpkg.in +++ b/bin/buildpkg.in @@ -151,7 +151,7 @@ done if [[ "${arch}" == 'multilib' ]]; then pacman_conf_arch='multilib' - base_packages+=('multilib-devel') + base_packages+=('multilib-devel mhwd') work_dir=${chroots_pkg}/${branch}/${arch} cache_dir_pkg=${cache_dir}/${branch}/${arch} arch='x86_64' From 3b27f3ff1ea5a9949ce187c9e10470eff52aaa71 Mon Sep 17 00:00:00 2001 From: Philip Date: Sat, 28 Feb 2015 00:37:39 +0100 Subject: [PATCH 2/2] [multilib] another try --- bin/buildpkg.in | 2 +- lib/util-pkg.sh | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/bin/buildpkg.in b/bin/buildpkg.in index 9e1bad6..c72ed07 100644 --- a/bin/buildpkg.in +++ b/bin/buildpkg.in @@ -151,7 +151,7 @@ done if [[ "${arch}" == 'multilib' ]]; then pacman_conf_arch='multilib' - base_packages+=('multilib-devel mhwd') + base_packages+=('multilib-devel') work_dir=${chroots_pkg}/${branch}/${arch} cache_dir_pkg=${cache_dir}/${branch}/${arch} arch='x86_64' diff --git a/lib/util-pkg.sh b/lib/util-pkg.sh index 9ee4cde..b9f8b3e 100644 --- a/lib/util-pkg.sh +++ b/lib/util-pkg.sh @@ -59,6 +59,7 @@ blacklist_pkg(){ set_gl_multilib(){ # keep this in-sync with mhwd msg "Setting libGL for multilib ..." + chroot-run $1/root mkdir -p /usr/lib32/ chroot-run $1/root ln -sf /usr/lib32/mesa/libGL.so.1.2.0 /usr/lib32/libGL.so chroot-run $1/root ln -sf /usr/lib32/mesa/libGL.so.1.2.0 /usr/lib32/libGL.so.1 chroot-run $1/root ln -sf /usr/lib32/mesa/libGL.so.1.2.0 /usr/lib32/libGL.so.1.2.0