This is the mail archive of the libc-alpha@sourceware.org mailing list for the glibc project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[PATCH] Remove locale-related environment variables from subprocess environments


This avoids a few testsuite failures if the user has set such variables.

--
Florian Weimer / Red Hat Product Security
>From a70c397f88315bd66f28aaf1471e9b37d774c95f Mon Sep 17 00:00:00 2001
From: Florian Weimer <fweimer@redhat.com>
Date: Mon, 8 Sep 2014 14:15:29 +0200
Subject: Remove locale-related environment variables from subprocess environments

This avoids a few testsuite failures if the user has set such
variables.
---
 ChangeLog  | 10 ++++++++++
 Makeconfig | 27 +++++++++++++++++++++++++--
 2 files changed, 35 insertions(+), 2 deletions(-)

 2014-09-08  Florian Weimer  <fweimer@redhat.com>
 
	* Makeconfig (.NOEXPORT): Remove, no longer supported by GNU Make.
	(CHARSET, GCONV_PATH, I18NPATH, LANG, LANGUAGE, LANGUAGES,
	LC_ADDRESS, LC_ALL, LC_COLLATE, LC_CTYPE, LC_IDENTIFICATION,
	LC_MEASUREMENT, LC_MESSAGES, LC_MONETARY, LC_NAME, LC_NUMERIC,
	LC_PAPER, LC_TELEPHONE, LC_TIME, LOCPATH, NLSPATH,
	OUTPUT_CHARSET): Unexport (and implicitly clear)
	environment variables

diff --git a/Makeconfig b/Makeconfig
index 0f8069b..2bb9e9f 100644
--- a/Makeconfig
+++ b/Makeconfig
@@ -760,8 +760,31 @@ endif
 #### End of configuration variables.
 ####
 
-# This tells some versions of GNU make before 3.63 not to export all variables.
-.NOEXPORT:
+# Unexport (and thus implicitly clear) locale-related environment
+# variables.
+unexport CHARSET
+unexport GCONV_PATH
+unexport I18NPATH
+unexport LANG
+unexport LANGUAGE
+unexport LANGUAGES
+unexport LC_ADDRESS
+unexport LC_ALL
+unexport LC_COLLATE
+unexport LC_CTYPE
+unexport LC_IDENTIFICATION
+unexport LC_MEASUREMENT
+unexport LC_MESSAGES
+unexport LC_MONETARY
+unexport LC_NAME
+unexport LC_NUMERIC
+unexport LC_PAPER
+unexport LC_TELEPHONE
+unexport LC_TIME
+unexport LOCPATH
+unexport NLSPATH
+unexport OUTPUT_CHARSET
+
 
 # We want to echo the commands we're running without
 # umpteen zillion filenames along with it (we use `...' instead)
-- 
1.9.3


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]