From f7bb54b85669e01668507431bb32b0e06d17c67f Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@voidlinux.eu>
Date: Thu, 21 May 2015 12:02:31 +0200
Subject: [PATCH] environment: override gettext tests for musl on native too.

---
 .../configure/autoconf_cache/musl-linux       |  1 +
 .../configure/gnu-configure-args.sh           | 22 +++++++++++++------
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/common/environment/configure/autoconf_cache/musl-linux b/common/environment/configure/autoconf_cache/musl-linux
index 494d96ccfc..76b3503bcd 100644
--- a/common/environment/configure/autoconf_cache/musl-linux
+++ b/common/environment/configure/autoconf_cache/musl-linux
@@ -1,4 +1,5 @@
 # Force detection of musl's gettext
+gt_func_gnugettext_libc=yes
 gt_cv_func_gnugettext1_libc=yes
 gt_cv_func_gnugettext2_libc=yes
 gt_cv_func_gnugettext3_libc=yes
diff --git a/common/environment/configure/gnu-configure-args.sh b/common/environment/configure/gnu-configure-args.sh
index 2785ee68c1..36966926cc 100644
--- a/common/environment/configure/gnu-configure-args.sh
+++ b/common/environment/configure/gnu-configure-args.sh
@@ -14,18 +14,26 @@ if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
 	export configure_args+=" --libdir=/usr/lib32"
 fi
 
-# Cross compilation vars
-if [ -z "$CROSS_BUILD" ]; then
-	return 0
-fi
-
-export configure_args+=" --host=$XBPS_CROSS_TRIPLET --with-sysroot=$XBPS_CROSS_BASE --with-libtool-sysroot=$XBPS_CROSS_BASE "
-
 _AUTOCONFCACHEDIR=${XBPS_COMMONDIR}/environment/configure/autoconf_cache
 
 # From now on all vars are exported to the environment
 set -a
 
+# Read autoconf cache variables for native target.
+case "$XBPS_TARGET_MACHINE" in
+	# musl libc
+	*-musl) . ${_AUTOCONFCACHEDIR}/musl-linux
+		;;
+esac
+
+# Cross compilation vars
+if [ -z "$CROSS_BUILD" ]; then
+	set +a
+	return 0
+fi
+
+export configure_args+=" --host=$XBPS_CROSS_TRIPLET --with-sysroot=$XBPS_CROSS_BASE --with-libtool-sysroot=$XBPS_CROSS_BASE "
+
 # Read autoconf cache variables for cross target (taken from OE).
 case "$XBPS_TARGET_MACHINE" in
 	# musl libc