patch-Makefile 2.3 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364
  1. --- w-tzdata-2010o-1.orig/Makefile 2010-10-12 18:36:50.000000000 +0200
  2. +++ w-tzdata-2010o-1/Makefile 2011-01-22 22:10:00.358658180 +0100
  3. @@ -212,13 +212,13 @@ GCC_DEBUG_FLAGS = -Dlint -g -O -fno-comm
  4. # before the first Monday in January when a "%V" format is used and January 1
  5. # falls on a Friday, Saturday, or Sunday.
  6. -CFLAGS=
  7. +CFLAGS?=
  8. # If you want zic's -s option used when installing, uncomment the next line
  9. # ZFLAGS= -s
  10. zic= ./zic
  11. -ZIC= $(zic) $(ZFLAGS)
  12. +ZIC= ./zic_for_build $(ZFLAGS)
  13. # The name of a Posix-compliant `awk' on your system.
  14. AWK= nawk
  15. @@ -279,7 +279,7 @@ ENCHILADA= $(DOCS) $(SOURCES) $(DATA) $(
  16. SHELL= /bin/sh
  17. -all: tzselect zic zdump $(LIBOBJS)
  18. +all: zic_for_build tzselect zic zdump $(LIBOBJS)
  19. ALL: all date
  20. @@ -309,6 +309,14 @@ INSTALL: ALL install date.1
  21. -rm -f $(MANDIR)/man1/date.1
  22. cp date.1 $(MANDIR)/man1/.
  23. +zic_for_build:
  24. + $(CC_FOR_BUILD) -c $(CFLAGS_FOR_BUILD) zic.c -o zic_build.o
  25. + $(CC_FOR_BUILD) -c $(CFLAGS_FOR_BUILD) localtime.c -o localtime_build.o
  26. + $(CC_FOR_BUILD) -c $(CFLAGS_FOR_BUILD) asctime.c -o asctime_build.o
  27. + $(CC_FOR_BUILD) -c $(CFLAGS_FOR_BUILD) scheck.c -o scheck_build.o
  28. + $(CC_FOR_BUILD) -c $(CFLAGS_FOR_BUILD) ialloc.c -o ialloc_build.o
  29. + $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -o $@ zic_build.o localtime_build.o asctime_build.o scheck_build.o ialloc_build.o
  30. +
  31. zdump: $(TZDOBJS)
  32. $(CC) $(CFLAGS) $(LFLAGS) $(TZDOBJS) $(LDLIBS) -o $@
  33. @@ -319,10 +327,10 @@ yearistype: yearistype.sh
  34. cp yearistype.sh yearistype
  35. chmod +x yearistype
  36. -posix_only: zic $(TDATA)
  37. +posix_only: zic_for_build $(TDATA)
  38. $(ZIC) -y $(YEARISTYPE) -d $(TZDIR) -L /dev/null $(TDATA)
  39. -right_only: zic leapseconds $(TDATA)
  40. +right_only: zic_for_build leapseconds $(TDATA)
  41. $(ZIC) -y $(YEARISTYPE) -d $(TZDIR) -L leapseconds $(TDATA)
  42. # In earlier versions of this makefile, the other two directories were
  43. @@ -334,7 +342,7 @@ right_only: zic leapseconds $(TDATA)
  44. # Therefore, the other two directories are now siblings of $(TZDIR).
  45. # You must replace all of $(TZDIR) to switch from not using leap seconds
  46. # to using them, or vice versa.
  47. -other_two: zic leapseconds $(TDATA)
  48. +other_two: zic_for_build leapseconds $(TDATA)
  49. $(ZIC) -y $(YEARISTYPE) -d $(TZDIR)-posix -L /dev/null $(TDATA)
  50. $(ZIC) -y $(YEARISTYPE) \
  51. -d $(TZDIR)-leaps -L leapseconds $(TDATA)