| 123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960 |
- --- toolchain_build_i686_eglibc/w-eglibc-2.16-1/eglibc-2.16/libc/timezone/Makefile 2012-07-31 08:58:48.000000000 +0200
- +++ toolchain_build_i686_glibc/w-glibc-2.16.0-1/glibc-2.16.0/timezone/Makefile 2012-06-30 21:12:34.000000000 +0200
- @@ -52,16 +52,7 @@
- include ../Rules
-
-
- -zic-objs = zic.o ialloc.o scheck.o
- -
- -$(objpfx)zic: $(addprefix $(objpfx), $(zic-objs))
- -
- -$(addprefix $(objpfx)cross-,$(zic-objs)): $(objpfx)cross-%.o: %.c
- - $(BUILD_CC) $< -c $(OUTPUT_OPTION) $(CFLAGS-$*.c) $(CPPFLAGS-$*) \
- - -DCROSS_ZIC $(compile-mkdep-flags)
- -
- -$(objpfx)cross-zic: $(addprefix $(objpfx)cross-,$(zic-objs))
- - $(BUILD_CC) $(addprefix $(objpfx)cross-,$(zic-objs)) -o $@
- +$(objpfx)zic: $(objpfx)scheck.o $(objpfx)ialloc.o
-
- tz-cflags = -DTZDIR='"$(zonedir)"' \
- -DTZDEFAULT='"$(localtime-file)"' \
- @@ -78,17 +69,10 @@
- # 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)/, \
- @@ -101,11 +85,7 @@
- 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)
- @@ -127,8 +107,6 @@
-
- $(objpfx)tzselect: tzselect.ksh $(common-objpfx)config.make
- sed -e 's%@KSH@%$(KSH)%g' \
- - -e 's%@TZDIR@%$(zonedir)%g' \
- - -e 's%@PKGVERSION@%$(PKGVERSION)%g' \
- - -e 's%@REPORT_BUGS_TO@%$(REPORT_BUGS_TO)%g' < $< > $@.new
- + -e 's%@TZDIR@%$(zonedir)%g' < $< > $@.new
- chmod 555 $@.new
- mv -f $@.new $@
|
