From 86a0db8224f640478037ff5d33a0a6f2882664c2 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 22 Dec 2020 21:37:58 +0100
Subject: [PATCH] attr: use wordsize for libdir

---
 srcpkgs/attr/template | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/attr/template b/srcpkgs/attr/template
index 5a97200944..c5e6b8aa5e 100644
--- a/srcpkgs/attr/template
+++ b/srcpkgs/attr/template
@@ -5,7 +5,8 @@ revision=1
 bootstrap=yes
 build_style=gnu-configure
 checkdepends="perl"
-configure_args="--libdir=/usr/lib --libexecdir=/usr/lib"
+configure_args="--libdir=/usr/lib${XBPS_TARGET_WORDSIZE}
+ --libexecdir=/usr/lib${XBPS_TARGET_WORDSIZE}"
 short_desc="Extended attribute support library for ACL support"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
@@ -18,10 +19,6 @@ conf_files="/etc/xattr.conf"
 # The included libtool is rotten and only works with bash; easiest fix.
 export CONFIG_SHELL=/bin/bash
 
-if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
-	configure_args="--libdir=/usr/lib32 --libexecdir=/usr/lib32"
-fi
-
 pre_check() {
 	# Either the test wasn't updated or the package misconfigures/miscompiles
 	# the error message in musl based systems