From add039fd50be77d2fc03a7a794947e005fcdea12 Mon Sep 17 00:00:00 2001
From: Bryan Hundven <bryanhundven@gmail.com>
Date: Tue, 27 Jan 2015 23:00:58 -0800
Subject: glibc: Fix pkgversion and bugurl support

glibc versions that don't support --with-pkgversion or --with-bugurl
will cause a harmless:

====================
configure: WARNING: unrecognized options: --with-bugurl...`
====================

If it's set, use it, if it's a recognized option.

Signed-off-by: Bryan Hundven <bryanhundven@gmail.com>

diff --git a/scripts/build/libc/glibc.sh b/scripts/build/libc/glibc.sh
index 2a0ae83..6ab1c50 100644
--- a/scripts/build/libc/glibc.sh
+++ b/scripts/build/libc/glibc.sh
@@ -603,8 +603,13 @@ do_libc_locales() {
 
     CT_DoLog EXTRA "Configuring C library localedef"
 
-    if [ "${CT_LIBC_GLIBC_HAS_PKGVERSION_BUGURL}" = "y" ]; then
+    # Versions that don't support --with-pkgversion or --with-bugurl will cause
+    # a harmless: `configure: WARNING: unrecognized options: --with-bugurl...`
+    # If it's set, use it, if is a recognized option.
+    if [ ! "${CT_TOOLCHAIN_PKGVERSION}" = "" ]; then
         extra_config+=("--with-pkgversion=${CT_PKGVERSION}")
+    fi
+    if [ ! "${CT_TOOLCHAIN_BUGURL}" = "" ]; then
         [ -n "${CT_TOOLCHAIN_BUGURL}" ] && extra_config+=("--with-bugurl=${CT_TOOLCHAIN_BUGURL}")
     fi
 
-- 
cgit v0.10.2-6-g49f6