From patchwork Sun May 11 10:27:39 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sami Kerola X-Patchwork-Id: 872 Return-Path: X-Original-To: siddhesh@wilcox.dreamhost.com Delivered-To: siddhesh@wilcox.dreamhost.com Received: from homiemail-mx20.g.dreamhost.com (mx2.sub5.homie.mail.dreamhost.com [208.113.200.128]) by wilcox.dreamhost.com (Postfix) with ESMTP id 256F036007B for ; Sun, 11 May 2014 03:28:11 -0700 (PDT) Received: by homiemail-mx20.g.dreamhost.com (Postfix, from userid 14307373) id AC06141848083; Sun, 11 May 2014 03:28:10 -0700 (PDT) X-Original-To: glibc@patchwork.siddhesh.in Delivered-To: x14307373@homiemail-mx20.g.dreamhost.com Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by homiemail-mx20.g.dreamhost.com (Postfix) with ESMTPS id 7E515418FC51E for ; Sun, 11 May 2014 03:28:10 -0700 (PDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id:in-reply-to :references; q=dns; s=default; b=JWh3p/IIlgsnPXDwoHd1WRiPmz7eHNr oySXJ04xY0pdRbODDAtriv/Ef2StkMbQkxf3K3+JgMdeUwscty5SJgrRA3nB9JCW nxPt0zZoQItQPBv8CASfSYyuW2iTOUl8QABLILVIBR5Lb/alKC+ho5z6cAbAAOss jdYzUWLH8qdY= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id:in-reply-to :references; s=default; bh=recKQ/2DRZFkGuVxzVa3daKmNEs=; b=r2h4j MOGylXIYo8P1loXCz7QhACmuENs2dlhZu1DQR7GhefpPMqbjoPdAKt+jpdbG8FGR PmiyGVVQr6lS71wkl7NvDM0sI6M1UgV5JjF3OsrhwUN588BOdC1osygVdynRNh4w uWTcIJfpjNCDOgRkCp0seu0eScmuYR0wixmtSY= Received: (qmail 6418 invoked by alias); 11 May 2014 10:28:05 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 6393 invoked by uid 89); 11 May 2014 10:28:02 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.6 required=5.0 tests=BAYES_00, FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=ham version=3.3.2 X-HELO: mail-we0-f180.google.com X-Received: by 10.180.75.45 with SMTP id z13mr11157897wiv.41.1399804078201; Sun, 11 May 2014 03:27:58 -0700 (PDT) From: Sami Kerola To: =?UTF-8?q?Ondrej=20B=EDlka?= Cc: kerolasa@iki.fi, libc-alpha@sourceware.org, Allan McRae Subject: [PATCH] tzselect: use zonedir instead of current working directory Date: Sun, 11 May 2014 11:27:39 +0100 Message-Id: <1399804059-29952-1-git-send-email-kerolasa@iki.fi> In-Reply-To: <20140510165438.GA11500@domone> References: <1399716175-898-1-git-send-email-kerolasa@iki.fi> <536DFB37.6030203@archlinux.org> <1399722730-3465-1-git-send-email-kerolasa@iki.fi> <20140510165438.GA11500@domone> X-DH-Original-To: glibc@patchwork.siddhesh.in Hi Ondrej, Here's the version with ChangeLog update. --->8---- From: Sami Kerola Date: Sat, 10 May 2014 12:42:44 +0100 Subject: [PATCH] tzselect: use zonedir instead of current working directory Use in Makefile the same TZDIR regular expression as what is used in tz project. This regression was introduced in commit 85bff96 and is part of glibc-2.19 release. $ cd /tmp/ && tzselect /usr/bin/tzselect: line 171: /tmp/iso3166.tab: No such file or directory /usr/bin/tzselect: time zone files are not set up correctly --- ChangeLog | 5 +++++ timezone/Makefile | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 2c08c50..d7dda08 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2014-05-10 Sami Kerola + + * timezone/Makefile ($(objpfx)tzselect): Use zonedir instead + current working directory + 2014-05-09 Roland McGrath * sysdeps/arm/armv7/strcmp.S: Use sfi_breg prefix on loads not from sp. diff --git a/timezone/Makefile b/timezone/Makefile index 998cd14..d5f647c 100644 --- a/timezone/Makefile +++ b/timezone/Makefile @@ -118,7 +118,7 @@ $(testdata)/Asia/Tokyo: asia $(zic-deps) $(objpfx)tzselect: tzselect.ksh $(common-objpfx)config.make sed -e 's|/bin/bash|$(BASH)|' \ - -e '/TZDIR=/s|\$$(pwd)|$(zonedir)|' \ + -e 's|TZDIR=[^}]*|TZDIR=$(TZDIR)|' \ -e '/TZVERSION=/s|see_Makefile|"$(version)"|' \ -e '/PKGVERSION=/s|=.*|="$(PKGVERSION)"|' \ -e '/REPORT_BUGS_TO=/s|=.*|="$(REPORT_BUGS_TO)"|' \