tzcode: Update to 2023d
two hunks had conflicts: * just use cc instead of gcc, it should be the same * HAVE_ADJTIME isn't used anymore anyway, so we can just remove it
This commit is contained in:
@@ -18,15 +18,6 @@
|
||||
|
||||
# Manual pages go in subdirectories of. . .
|
||||
MANDIR = $(TOPDIR)/$(USRSHAREDIR)/man
|
||||
@@ -370,7 +370,7 @@
|
||||
# January's first Monday when a "%V" format is used and January 1
|
||||
# falls on a Friday, Saturday, or Sunday.
|
||||
|
||||
-CFLAGS=
|
||||
+CFLAGS+= -DHAVE_ADJTIME=0
|
||||
|
||||
# Linker flags. Default to $(LFLAGS) for backwards compatibility
|
||||
# to release 2012h and earlier.
|
||||
@@ -403,7 +403,7 @@
|
||||
# Also, it is better (though not essential) if 'awk' supports UTF-8,
|
||||
# and unfortunately mawk and busybox awk do not support UTF-8.
|
||||
@@ -36,12 +27,3 @@
|
||||
|
||||
# The full path name of a Posix-compliant shell, preferably one that supports
|
||||
# the Korn shell's 'select' statement as an extension.
|
||||
@@ -482,7 +482,7 @@
|
||||
|
||||
#MAKE= make
|
||||
|
||||
-cc= cc
|
||||
+cc= gcc
|
||||
CC= $(cc) -DTZDIR='"$(TZDIR)"'
|
||||
|
||||
AR= ar
|
||||
|
||||
Reference in New Issue
Block a user