From bc5aee2c5f6ce642bd7779721b5a11a9c2b2f19b Mon Sep 17 00:00:00 2001
From: Pierre Labastie <pierre@linuxfromscratch.org>
Date: Fri, 1 Jan 2016 18:24:07 +0000
Subject: [PATCH] Merge trunk r3851

---
 CLFS/master.sh  | 1 +
 CLFS2/master.sh | 1 +
 CLFS3/master.sh | 1 +
 3 files changed, 3 insertions(+)

diff --git a/CLFS/master.sh b/CLFS/master.sh
index d0d7628..e150f00 100644
--- a/CLFS/master.sh
+++ b/CLFS/master.sh
@@ -63,6 +63,7 @@ cat << EOF
 	echo "" >> \$(LUSER_HOME)/.bashrc && \\
 	echo "unset CFLAGS" >> \$(LUSER_HOME)/.bashrc && \\
 	echo "unset CXXFLAGS" >> \$(LUSER_HOME)/.bashrc && \\
+	echo "unset PKG_CONFIG_PATH" >> \$(LUSER_HOME)/.bashrc && \\
 	echo "" >> \$(LUSER_HOME)/.bashrc && \\
 EOF
 ) >> $MKFILE.tmp
diff --git a/CLFS2/master.sh b/CLFS2/master.sh
index f3d97fb..f85db31 100644
--- a/CLFS2/master.sh
+++ b/CLFS2/master.sh
@@ -45,6 +45,7 @@ cat << EOF
 	echo "" >> \$(LUSER_HOME)/.bashrc && \\
 	echo "unset CFLAGS" >> \$(LUSER_HOME)/.bashrc && \\
 	echo "unset CXXFLAGS" >> \$(LUSER_HOME)/.bashrc && \\
+	echo "unset PKG_CONFIG_PATH" >> \$(LUSER_HOME)/.bashrc && \\
 	echo "" >> \$(LUSER_HOME)/.bashrc && \\
 	echo "export CLFS_HOST=\"${CLFS_HOST}\"" >> \$(LUSER_HOME)/.bashrc && \\
 	echo "export CLFS_TARGET=\"${TARGET}\"" >> \$(LUSER_HOME)/.bashrc && \\
diff --git a/CLFS3/master.sh b/CLFS3/master.sh
index 9f500dc..aa50529 100644
--- a/CLFS3/master.sh
+++ b/CLFS3/master.sh
@@ -45,6 +45,7 @@ cat << EOF
 	echo "" >> \$(LUSER_HOME)/.bashrc && \\
 	echo "unset CFLAGS" >> \$(LUSER_HOME)/.bashrc && \\
 	echo "unset CXXFLAGS" >> \$(LUSER_HOME)/.bashrc && \\
+	echo "unset PKG_CONFIG_PATH" >> \$(LUSER_HOME)/.bashrc && \\
 	echo "" >> \$(LUSER_HOME)/.bashrc && \\
 	echo "export CLFS_HOST=\"${CLFS_HOST}\"" >> \$(LUSER_HOME)/.bashrc && \\
 	echo "export CLFS_TARGET=\"${TARGET}\"" >> \$(LUSER_HOME)/.bashrc && \\