|
|
@@ -1,135 +0,0 @@
|
|
|
|
|
|
-+++ glibc-2.12.1.orig/timezone/Makefile 2011-01-10 15:20:02.576150764 +0100
|
|
|
-@@ -69,13 +69,10 @@
|
|
|
- $(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
|
|
|
-@@ -106,18 +103,35 @@
|
|
|
- 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 '$$(addprefix $$(dir $$(inst_zonedir))zone%/right/,$$($*-zones)): \' ;) > $@.new
|
|
|
-+
|
|
|
-+ifeq (no,$(cross-compiling))
|
|
|
-+ (echo '$< $$(objpfx)zic leapseconds yearistype' ;) >> $@.new
|
|
|
-+else
|
|
|
-+ (echo '$< $$(objpfx)cross-zic leapseconds yearistype' ;) >> $@.new
|
|
|
-+endif
|
|
|
-+
|
|
|
-+ (echo ' $$(tzcompile)' ;\
|
|
|
-+ echo '$$(addprefix $$(dir $$(inst_zonedir))zone%/posix/,$$($*-zones)): \' ;) >> $@.new
|
|
|
-+
|
|
|
-+ifeq (no,$(cross-compiling))
|
|
|
-+ (echo '$< $$(objpfx)zic /dev/null yearistype' ;) >> $@.new
|
|
|
-+else
|
|
|
-+ (echo '$< $$(objpfx)cross-zic /dev/null yearistype' ;) >> $@.new
|
|
|
-+endif
|
|
|
-+
|
|
|
-+ (echo ' $$(tzcompile)' ;\
|
|
|
-+ echo '$$(addprefix $$(dir $$(inst_zonedir))zone%/,$$($*-zones)): \' ;) >> $@.new
|
|
|
-+
|
|
|
-+ifeq (no,$(cross-compiling))
|
|
|
-+ (echo '$< $$(objpfx)zic $$(leapseconds) yearistype' ;) >> $@.new
|
|
|
-+else
|
|
|
-+ (echo '$< $$(objpfx)cross-zic $$(leapseconds) yearistype' ;) >> $@.new
|
|
|
-+endif
|
|
|
-+
|
|
|
-+ (echo ' $$(tzcompile)' ;\
|
|
|
- echo 'endif' ;\
|
|
|
-- echo 'zonenames := $$(zonenames) $$($*-zones)' ;\
|
|
|
-- ) > $@.new
|
|
|
-+ echo 'zonenames := $$(zonenames) $$($*-zones)' ;) >> $@.new
|
|
|
- mv $@.new $@
|
|
|
-
|
|
|
- .PHONY: echo-zonenames
|
|
|
-@@ -128,7 +142,11 @@
|
|
|
- # 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'.
|
|
|
-+ifeq (no,$(cross-compiling))
|
|
|
- zic-cmd = $(built-program-cmd) -d $(inst_zonedir)
|
|
|
-+else
|
|
|
-+zic-cmd = $(objpfx)cross-zic -d $(inst_zonedir)
|
|
|
-+endif
|
|
|
- tzcompile = $(zic-cmd)$(target-zone-flavor) -L $(word 3,$^) \
|
|
|
- -y $(dir $(word 4,$^))$(notdir $(word 4,$^)) $<
|
|
|
-
|
|
|
-@@ -158,8 +176,17 @@
|
|
|
- $(zic-cmd) -p $(posixrules)
|
|
|
- endif
|
|
|
-
|
|
|
-+zic-objs = zic.o ialloc.o scheck.o
|
|
|
-+
|
|
|
-+$(objpfx)zic: $(addprefix $(objpfx), $(zic-objs))
|
|
|
-+
|
|
|
-+$(addprefix $(objpfx)cross-,$(zic-objs)): $(objpfx)cross-%.o: %.c
|
|
|
-+ gcc $< -c $(OUTPUT_OPTION) \
|
|
|
-+ $(filter-out -DHAVE_GETTEXT,$(CFLAGS-$*.c)) \
|
|
|
-+ $(CPPFLAGS-$*) -DCROSS_ZIC $(compile-mkdep-flags)
|
|
|
-
|
|
|
--$(objpfx)zic: $(objpfx)scheck.o $(objpfx)ialloc.o
|
|
|
-+$(objpfx)cross-zic: $(addprefix $(objpfx)cross-,$(zic-objs))
|
|
|
-+ gcc $(addprefix $(objpfx)cross-,$(zic-objs)) -o $@
|
|
|
-
|
|
|
- tz-cflags = -DTZDIR='"$(zonedir)"' \
|
|
|
- -DTZDEFAULT='"$(localtime-file)"' \
|
|
|
-@@ -176,10 +203,17 @@
|
|
|
- # Don't add leapseconds here since test-tz made checks that work only without
|
|
|
- # leapseconds.
|
|
|
- testdata = $(objpfx)testdata
|
|
|
-+ifeq (no,$(cross-compiling))
|
|
|
- define build-testdata
|
|
|
- GCONV_PATH=${common-objpfx}iconvdata LANGUAGE=C LC_ALL=C \
|
|
|
- $(built-program-cmd) -d $(testdata) -y ./yearistype $<
|
|
|
- endef
|
|
|
-+else
|
|
|
-+define build-testdata
|
|
|
-+LANGUAGE=C LC_ALL=C \
|
|
|
-+ $(objpfx)cross-zic -d $(testdata) -y ./yearistype $<
|
|
|
-+endef
|
|
|
-+endif
|
|
|
-
|
|
|
- $(objpfx)test-tz.out: $(addprefix $(testdata)/, America/New_York Etc/UTC UTC)
|
|
|
- $(objpfx)tst-timezone.out: $(addprefix $(testdata)/, \
|
|
|
-@@ -192,7 +226,11 @@
|
|
|
- tst-timezone-ENV = TZDIR=$(testdata)
|
|
|
-
|
|
|
- # Note this must come second in the deps list for $(built-program-cmd) to work.
|
|
|
-+ifeq (no,$(cross-compiling))
|
|
|
- zic-deps = $(objpfx)zic $(leapseconds) yearistype
|
|
|
-+else
|
|
|
-+zic-deps = $(objpfx)cross-zic $(objpfx)zic $(leapseconds) yearistype
|
|
|
-+endif
|
|
|
-
|
|
|
- $(testdata)/America/New_York: northamerica $(zic-deps)
|
|
|
- $(build-testdata)
|
|
|
-@@ -214,7 +252,9 @@
|
|
|
-
|
|
|
- $(objpfx)tzselect: tzselect.ksh $(common-objpfx)config.make
|
|
|
- sed -e 's%@KSH@%$(KSH)%g' \
|
|
|
-- -e 's%@TZDIR@%$(zonedir)%g' < $< > $@.new
|
|
|
-+ -e 's%@TZDIR@%$(zonedir)%g' \
|
|
|
-+ -e 's%@PKGVERSION@%$(PKGVERSION)%g' \
|
|
|
-+ -e 's%@REPORT_BUGS_TO@%$(REPORT_BUGS_TO)%g' < $< > $@.new
|
|
|
- chmod 555 $@.new
|
|
|
- mv -f $@.new $@
|
|
|
-
|
