diff options
Diffstat (limited to 'testing/glibc/glibc-2.15-do-not-install-timezone-files.patch')
| -rw-r--r-- | testing/glibc/glibc-2.15-do-not-install-timezone-files.patch | 124 |
1 files changed, 0 insertions, 124 deletions
diff --git a/testing/glibc/glibc-2.15-do-not-install-timezone-files.patch b/testing/glibc/glibc-2.15-do-not-install-timezone-files.patch deleted file mode 100644 index e4f29bc1a..000000000 --- a/testing/glibc/glibc-2.15-do-not-install-timezone-files.patch +++ /dev/null @@ -1,124 +0,0 @@ -diff --git a/timezone/Makefile b/timezone/Makefile -index e8fb716..d5ea538 100644 ---- a/timezone/Makefile -+++ b/timezone/Makefile -@@ -1,4 +1,4 @@ --# Copyright (C) 1998,1999,2000,2002,2005,2007 Free Software Foundation, Inc. -+# Copyright (C) 1998-2000,2002,2005,2007,2012 Free Software Foundation, Inc. - # This file is part of the GNU C Library. - - # The GNU C Library is free software; you can redistribute it and/or -@@ -49,33 +49,6 @@ include ../Makeconfig # Get objpfx defined so we can use it below. - - CPPFLAGS-zic = -DNOT_IN_libc - --# z.* use this variable. --define nl -- -- --endef --ifndef avoid-generated --ifndef inhibit_timezone_rules ---include $(addprefix $(objpfx)z.,$(tzfiles)) --endif --endif -- --# Make these absolute file names. --installed-localtime-file := $(firstword $(filter /%,$(inst_localtime-file)) \ -- $(addprefix $(inst_zonedir)/, \ -- $(localtime-file))) --installed-posixrules-file := $(firstword $(filter /%,$(posixrules-file)) \ -- $(addprefix $(inst_zonedir)/, \ -- $(posixrules-file))) -- --ifeq ($(cross-compiling),no) --# Don't try to install the zoneinfo files since we can't run zic. --install-others = $(addprefix $(inst_zonedir)/,$(zonenames) \ -- $(zonenames:%=posix/%) \ -- $(zonenames:%=right/%)) \ -- $(installed-localtime-file) $(installed-posixrules-file) --endif -- - ifeq ($(have-ksh),yes) - install-others += $(inst_zonedir)/iso3166.tab $(inst_zonedir)/zone.tab - install-bin-script = tzselect -@@ -85,79 +58,6 @@ endif - include ../Rules - - --$(tzfiles:%=$(objpfx)z.%): $(objpfx)z.%: % Makefile --# Kludge alert: we use an implicit rule (in what we are generating here) --# because that is the only way to tell Make that the one command builds all --# the files. --# The extra kludge for the $(tzlinks) files is necessary since running zic --# this file requires all other files to exist. Blech! -- $(make-target-directory) -- (echo 'define $*-zones' ;\ -- $(AWK) '$$1 == "Zone" { print $$2 } $$1 == "Link" { print $$3 }' $^ ;\ -- echo 'endef' ;\ -- echo '$*-zones := $$(subst $$(nl), ,$$($*-zones))' ;\ -- echo 'ifdef $*-zones' ;\ -- if test x$(findstring $*, $(tzlinks)) != x; then \ -- echo '$$(addprefix $$(inst_zonedir)/right/,$$($*-zones)): \';\ -- echo '$$(foreach t,$$(tzbases),$$(addprefix $$(inst_zonedir)/right/,$$($$t-zones)))' ;\ -- echo '$$(addprefix $$(inst_zonedir)/posix/,$$($*-zones)): \';\ -- echo '$$(foreach t,$$(tzbases),$$(addprefix $$(inst_zonedir)/posix/,$$($$t-zones)))' ;\ -- echo '$$(addprefix $$(inst_zonedir)/,$$($*-zones)): \' ;\ -- echo '$$(foreach t,$$(tzbases),$$(addprefix $$(inst_zonedir)/,$$($$t-zones)))' ;\ -- fi ;\ -- echo '$$(addprefix $$(dir $$(inst_zonedir))zone%/right/,$$($*-zones)): \' ;\ -- echo '$< $$(objpfx)zic leapseconds yearistype' ;\ -- echo ' $$(tzcompile)' ;\ -- echo '$$(addprefix $$(dir $$(inst_zonedir))zone%/posix/,$$($*-zones)): \' ;\ -- echo '$< $$(objpfx)zic /dev/null yearistype' ;\ -- echo ' $$(tzcompile)' ;\ -- echo '$$(addprefix $$(dir $$(inst_zonedir))zone%/,$$($*-zones)): \' ;\ -- echo '$< $$(objpfx)zic $$(leapseconds) yearistype' ;\ -- echo ' $$(tzcompile)' ;\ -- echo 'endif' ;\ -- echo 'zonenames := $$(zonenames) $$($*-zones)' ;\ -- ) > $@.new -- mv $@.new $@ -- --.PHONY: echo-zonenames --echo-zonenames: -- @echo 'Known zones: $(zonenames)' -- -- --# We have to use `-d $(inst_zonedir)' to explictly tell zic where to --# place the output files although $(zonedir) is compiled in. But the --# user might have set $(install_root) on the command line of `make install'. --zic-cmd = $(built-program-cmd) -d $(inst_zonedir) --tzcompile = $(zic-cmd)$(target-zone-flavor) -L $(word 3,$^) \ -- -y $(dir $(word 4,$^))$(notdir $(word 4,$^)) $< -- --# The source files specify the zone names relative to the -d directory, --# so for the posix/ and right/ flavors we need to pass -d $(inst_zonedir)/posix --# and the like. This magic extracts /posix or /right if it's the first --# component after $(inst_zonedir) in the target name $@. --target-zone-flavor = $(filter /posix /right, \ -- /$(firstword $(subst /, , \ -- $(patsubst $(inst_zonedir)/%,%,$@)))) -- --ifdef localtime --$(installed-localtime-file): $(inst_zonedir)/$(localtime) $(objpfx)zic \ -- $(+force) -- $(make-target-directory) -- if test -r $@; then \ -- echo Site timezone NOT reset to Factory.; \ -- else \ -- rm -f $@T; \ -- $(SHELL) $(..)scripts/rellns-sh $< $@T; \ -- mv -f $@T $@; \ -- fi --endif --ifdef posixrules --$(installed-posixrules-file): $(inst_zonedir)/$(posixrules) $(objpfx)zic \ -- $(+force) -- $(zic-cmd) -p $(posixrules) --endif -- -- - $(objpfx)zic: $(objpfx)scheck.o $(objpfx)ialloc.o - - tz-cflags = -DTZDIR='"$(zonedir)"' \ |