Use --libdir=/usr/lib32 on x86 and create/remove the symlink via hooks.

This is to make all pkgs that use ${configure_args} work without changes
to the templates on x86_64.

common/environment/configure/gnu-configure-args.sh

@@ -4,6 +4,11 @@ if [ -z "$build_style" -o "$build_style" = "gnu-configure" ]; then
 	export configure_args="--prefix=/usr --sysconfdir=/etc --infodir=/usr/share/info --mandir=/usr/share/man --localstatedir=/var ${configure_args}"
 fi
 
+if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
+	# on x86 use /usr/lib32 as libdir, but just as fake directory,
+	# because /usr/lib32 is a symlink to /usr/lib in void.
+	export configure_args+=" --libdir=/usr/lib32"
+fi
 
 # Cross compilation vars
 if [ -z "$CROSS_BUILD" ]; then

common/hooks/post-install/98-lib32.sh

@@ -0,0 +1,7 @@
+# This hook removes the /usr/lib32 symlink on x86.
+
+hook() {
+	if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
+		rm -f ${DESTDIR}/usr/lib32
+	fi
+}

common/hooks/pre-install/00-lib32.sh

@@ -0,0 +1,8 @@
+# This hook creates the /usr/lib32 symlink for x86.
+
+hook() {
+	if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
+		vmkdir usr/lib
+		ln -sf lib ${DESTDIR}/usr/lib32
+	fi
+}