X-Authentication-Warning:	delorie.com: mail set sender to djgpp-bounces using -f
X-Recipient:	djgpp AT delorie DOT com
X-Original-DKIM-Signature:	v=1; a=rsa-sha256; c=relaxed/relaxed;
	d=gmail.com; s=20120113;
	h=mime-version:in-reply-to:references:date:message-id:subject:from:to
	:content-type;
	bh=yv4HmUstJtDndR9mtwBBNh80j5a0+zO//dvby+/p2e8=;
	b=Qck/CPOdbiN4tZY9QjQMqhYMfKCpGnRGgrmAP83mWMko+I5UFFKJgkEE+9ae6mtaCE
	8zKeXAXWuyk0bGYcx478/vKH69Qupg8da7JPrzHjhASVV1hlKwOKuCnCnzgbTWk4N/Yu
	LNEHYnmvzO/msK7S6y+uAt+Eo0YEJNmmdZjpqxQdFX6M86B+WPEV5qRcWfk/u77XhLxZ
	wNN5MC5ob55lNui1uuMbnYyWN7eryWEOWW0yoCQRuQKps/7EBDD1J62r0R+Sq57xwnsB
	/2hCY6ldVAMvs0XdWjed/bF0fXIVz2ItYMw3tZkem+HOj5bprOBUU0OVh/dRVGy/OIMT
	BTiQ==
MIME-Version:	1.0
X-Received:	by 10.50.225.35 with SMTP id rh3mr16168644igc.29.1432453941365;
	Sun, 24 May 2015 00:52:21 -0700 (PDT)
In-Reply-To:	<CAA2C=vAb2KvK+j=Q_J=88BYiJACJ023bq4eJzOd_AusWF_2ZVQ@mail.gmail.com>
References:	<201505042003 DOT t44K3odg011007 AT delorie DOT com>
	<CAA2C=vDjMv6vQbayBvrpwWTCp3Eu4SjardA8y6ujZPV_bY-cbQ AT mail DOT gmail DOT com>
	<83mw106kgn DOT fsf AT gnu DOT org>
	<CAA2C=vD9T8H=fjrattH6RkH7Dec611TCjQKnc4N5e+3LD5Y9Gg AT mail DOT gmail DOT com>
	<CAA2C=vAb2KvK+j=Q_J=88BYiJACJ023bq4eJzOd_AusWF_2ZVQ AT mail DOT gmail DOT com>
Date:	Sun, 24 May 2015 10:52:21 +0300
Message-ID:	<CAA2C=vBMqahbJmkps9-GS0pmQVTL83m6f4rFa09fFQ7Bk4Ooww@mail.gmail.com>
Subject:	Re: ANNOUNCE: DJGPP 2.05 beta 1
From:	"Ozkan Sezer (sezeroz AT gmail DOT com)" <djgpp AT delorie DOT com>
To:	djgpp AT delorie DOT com
Reply-To:	djgpp AT delorie DOT com
Errors-To:	nobody AT delorie DOT com
X-Mailing-List:	djgpp AT delorie DOT com
X-Unsubscribes-To:	listserv AT delorie DOT com

On 5/23/15, Ozkan Sezer <sezeroz AT gmail DOT com> wrote:
> Updated patch for zoneinfo build system follows (also attached
> as a patch file.) Bulid tested using 2.03 and 2.05 cross toolchains,
> also successfully built under winxp using gcc-2.95 and djgpp-2.03
> based environment. If no objections, I plan to apply this tomorrow.
>
> * build tz binaries against source-tree, not against toolchain:
> - zic: define as dos-zic.exe or host-zic.exe depending on cross
>   or native build.
> - host-zic: place in $(TOPDIR)/hostbin like other utils.
> - HOST_ZIC: new var for 'host-zic' for cross-builds.
> - HOST_ZIC: do not build if cross-compiling, copy over target-
>   zic.exe to hostbin/ instead.
> - LIBGCCA, DJGPP_DJL: copied defitinions from src/makefile.inc.
> - CFLAGS: add -nostdinc -I$(TOPDIR)/include
> - GCCFLAGS: (kept intact)
> - zdump.exe, zic.exe, date.exe: change rules to link against
>   freshly built crt0.o and libc.a.
> - date.exe: remove logwtmpl.a building, because it was linking
>   to locally built logwtmpl.a and logwtmp.o is simply an empty
>   object for dos-targeting builds.
> - debug flags: made them to work old compilers too, and cleaned
>   and tidied a bit.
>
> Index: zoneinfo/src/makefile
> ===================================================================
> RCS file: /cvs/djgpp/djgpp/zoneinfo/src/makefile,v
> retrieving revision 1.16
> diff -u -r1.16 makefile
> --- zoneinfo/src/makefile	26 Nov 2013 18:08:51 -0000	1.16
> +++ zoneinfo/src/makefile	23 May 2015 12:55:50 -0000
> @@ -87,6 +87,27 @@
>  CROSS_GCC_MAJOR := $(word 3, $(shell ../../src/misc.exe |
> $(CROSS_GCC) -E -dD -x c - | egrep 'define\ *__GNUC__'))
>  CROSS_GCC_MINOR := $(word 3, $(shell ../../src/misc.exe |
> $(CROSS_GCC) -E -dD -x c - | egrep 'define\ *__GNUC_MINOR__'))
>
> +# very old gcc, e.g. gcc-2.95, fails the above, so we invent a default.
> +ifeq ($(GCC_MAJOR),)
> +GCC_MAJOR := 2
> +GCC_MINOR := 7
> +endif
> +ifeq ($(CROSS_GCC_MAJOR),)
> +CROSS_GCC_MAJOR := 2
> +CROSS_GCC_MINOR := 7
> +endif
> +
> +ifeq ($(LIBGCCA),)
> +LIBGCCA := $(shell $(CROSS_GCC) $(GCC_OPT) -print-file-name=libgcc.a)
> +LIBGCCA := $(subst \,/,$(LIBGCCA))
> +export LIBGCCA
> +endif
> +
> +ifeq ($(DJGPP_DJL),)
> +DJGPP_DJL = $(TOPDIR)/lib/djgpp.djl
> +#export DJGPP_DJL
> +endif
> +
>  # A replacement for (possibly missing) Unix programs:
>
>  UTIL=		$(TOPDIR)/src/misc.exe
> @@ -162,97 +183,48 @@
>  #	-Wsuggest-attribute=noreturn -Wsuggest-attribute=pure -Wtrampolines \
>  #	-Wwrite-strings
>
> +COMMON_DEBUG_FLAGS = -Dlint -g -fno-common -fstrict-aliasing \
> +	-Wall -W -Wcast-align -Wcast-qual -Wpointer-arith \
> +	-Wmissing-declarations -Wmissing-prototypes -Wstrict-prototypes \
> +	-Wnested-externs -Wshadow -Wwrite-strings
> +
>  # Cross compiler debug flags.
> -CROSS_GCC_DEBUG_FLAGS_FOR_ALL = -Dlint -g2 -fno-common -fstrict-aliasing \
> -	-Wall -Wextra \
> -	-Wbad-function-cast -Wcast-align -Wcast-qual \
> -	-Wformat=2 -Winit-self \
> -	-Wmissing-declarations -Wmissing-noreturn -Wmissing-prototypes \
> -	-Wnested-externs -Wno-format-nonliteral -Wno-sign-compare \
> -	-Wno-unused-parameter  -Wpointer-arith -Wshadow -Wstrict-prototypes \
> -	-Wwrite-strings
> -
> -ifeq ($(CROSS_GCC_MAJOR),3)
> -ifeq ($(CROSS_GCC_MINOR),4)
> -CROSS_GCC_DEBUG_FLAGS = $(CROSS_GCC_DEBUG_FLAGS_FOR_ALL) -Wconversion
> -Wtraditional
> +ifeq ($(filter 2,$(CROSS_GCC_MAJOR)),)
> +# gcc >= 3.x
> +CROSS_GCC3_DFLAGS = -Wbad-function-cast -Wno-sign-compare
> -Wno-unused-parameter
> +ifeq ($(filter 3,$(CROSS_GCC_MAJOR)),)
> +ifeq ($(filter 4,$(CROSS_GCC_MAJOR)),)
> +# gcc >= 5.x
> +CROSS_GCC4_DFLAGS = -Wno-type-limits
> +else
> +# gcc >= 4.x
> +ifeq ($(filter 0 1 2,$(CROSS_GCC_MINOR)),)
> +# gcc >= 4.3
> +CROSS_GCC4_DFLAGS = -Wno-type-limits
> +endif
>  endif
>  endif
> -
> -ifeq ($(CROSS_GCC_MAJOR),4)
> - ifeq ($(CROSS_GCC_MINOR),0)
> -CROSS_GCC_DEBUG_FLAGS_SPECIAL =
> - else
> -  ifeq ($(CROSS_GCC_MINOR),1)
> -CROSS_GCC_DEBUG_FLAGS_SPECIAL =
> -  else
> -   ifeq ($(CROSS_GCC_MINOR),2)
> -CROSS_GCC_DEBUG_FLAGS_SPECIAL = -Woverlength-strings
> -   else
> -    ifeq ($(CROSS_GCC_MINOR),3)
> -CROSS_GCC_DEBUG_FLAGS_SPECIAL = -Woverlength-strings
> -Wno-sign-conversion -Wno-type-limits
> -    else
> -     ifeq ($(CROSS_GCC_MINOR),4)
> -CROSS_GCC_DEBUG_FLAGS_SPECIAL = -Woverlength-strings
> -Wno-sign-conversion -Wno-type-limits
> -     else
> -      ifeq ($(CROSS_GCC_MINOR),5)
> -CROSS_GCC_DEBUG_FLAGS_SPECIAL = -Woverlength-strings
> -Wno-sign-conversion -Wno-type-limits
> -      else
> -# gcc 4.6 and later works.
> -CROSS_GCC_DEBUG_FLAGS_SPECIAL = -Woverlength-strings
> -Wno-sign-conversion -Wno-type-limits -Wsuggest-attribute=const
> -Wsuggest-attribute=noreturn -Wsuggest-attribute=pure -Wtrampolines
> -      endif
> -     endif
> -    endif
> -   endif
> -  endif
> -CROSS_GCC_DEBUG_FLAGS = $(CROSS_GCC_DEBUG_FLAGS_FOR_ALL)
> $(CROSS_GCC_DEBUG_FLAGS_SPECIAL)
> - endif
>  endif
> +CROSS_GCC_DEBUG_FLAGS = $(COMMON_DEBUG_FLAGS) $(CROSS_GCC3_DFLAGS)
> $(CROSS_GCC4_DFLAGS)
>
>  # Native compiler debug flags.
> -GCC_DEBUG_FLAGS_FOR_ALL = -Dlint -g2 -fno-common -fstrict-aliasing \
> -	-Wall -Wextra \
> -	-Wbad-function-cast -Wcast-align -Wcast-qual \
> -	-Wformat=2 -Winit-self \
> -	-Wmissing-declarations -Wmissing-noreturn -Wmissing-prototypes \
> -	-Wnested-externs -Wno-format-nonliteral -Wno-sign-compare \
> -	-Wno-unused-parameter  -Wpointer-arith -Wshadow -Wstrict-prototypes \
> -	-Wwrite-strings
> -
> -ifeq ($(GCC_MAJOR),3)
> -ifeq ($(GCC_MINOR),4)
> -GCC_DEBUG_FLAGS = $(GCC_DEBUG_FLAGS_FOR_ALL) -Wconversion -Wtraditional
> +ifeq ($(filter 2,$(GCC_MAJOR)),)
> +# gcc >= 3.x
> +GCC3_DEBUG_FLAGS = -Wbad-function-cast -Wno-sign-compare
> -Wno-unused-parameter
> +ifeq ($(filter 3,$(GCC_MAJOR)),)
> +ifeq ($(filter 4,$(GCC_MAJOR)),)
> +# gcc >= 5.x
> +GCC4_DEBUG_FLAGS = -Wno-type-limits
> +else
> +# gcc >= 4.x
> +ifeq ($(filter 0 1 2,$(GCC_MINOR)),)
> +# gcc >= 4.3
> +GCC4_DEBUG_FLAGS = -Wno-type-limits
> +endif
>  endif
>  endif
> -
> -ifeq ($(GCC_MAJOR),4)
> - ifeq ($(GCC_MINOR),0)
> -GCC_DEBUG_FLAGS_SPECIAL =
> - else
> -  ifeq ($(GCC_MINOR),1)
> -GCC_DEBUG_FLAGS_SPECIAL =
> -  else
> -   ifeq ($(GCC_MINOR),2)
> -GCC_DEBUG_FLAGS_SPECIAL = -Woverlength-strings
> -   else
> -    ifeq ($(GCC_MINOR),3)
> -GCC_DEBUG_FLAGS_SPECIAL = -Woverlength-strings -Wno-sign-conversion
> -Wno-type-limits
> -    else
> -     ifeq ($(GCC_MINOR),4)
> -GCC_DEBUG_FLAGS_SPECIAL = -Woverlength-strings -Wno-sign-conversion
> -Wno-type-limits
> -     else
> -      ifeq ($(GCC_MINOR),5)
> -GCC_DEBUG_FLAGS_SPECIAL = -Woverlength-strings -Wno-sign-conversion
> -Wno-type-limits
> -      else
> -# gcc 4.6 and later works.
> -GCC_DEBUG_FLAGS_SPECIAL = -Woverlength-strings -Wno-sign-conversion
> -Wno-type-limits -Wsuggest-attribute=const
> -Wsuggest-attribute=noreturn -Wsuggest-attribute=pure -Wtrampolines
> -      endif
> -     endif
> -    endif
> -   endif
> -  endif
> -GCC_DEBUG_FLAGS = $(GCC_DEBUG_FLAGS_FOR_ALL) $(GCC_DEBUG_FLAGS_SPECIAL)
> - endif
>  endif
> +GCC_DEBUG_FLAGS = $(COMMON_DEBUG_FLAGS) $(GCC3_DEBUG_FLAGS)
> $(GCC4_DEBUG_FLAGS)
>
>  #
>  # If you want to use System V compatibility code, add
> @@ -349,7 +321,7 @@
>  		-DHAVE_STRERROR=1 -DHAVE_SYMLINK=0 -DHAVE_STDINT_H=1\
>  		-DSTD_INSPIRED \
>  		-DLOCALE_HOME=\"/dev/env/DJDIR~c:/djgpp~/share/locale\" \
> -		$(CROSS_GCC_DEBUG_FLAGS) -O2
> +		$(CROSS_GCC_DEBUG_FLAGS) -O2 -nostdinc -I$(TOPDIR)/include
>
>  # Flags for native compiler
>  GCCFLAGS=	-DHAVE_ADJTIME=0 -DHAVE_LONG_DOUBLE=1 -DHAVE_SETTIMEOFDAY=1 \
> @@ -368,7 +340,12 @@
>  LDFLAGS=	$(LFLAGS)
>
>  EXEEXT=		.exe
> -zic=		./host-zic
> +HOST_ZIC=	$(TOPDIR)/hostbin/zic$(EXEEXT)
> +ifeq ($(CROSS_BUILD),1)
> +zic=		$(HOST_ZIC)
> +else
> +zic=		zic$(EXEEXT)
> +endif
>  ZIC=		$(zic) $(ZFLAGS)
>
>  # The name of a Posix-compliant `awk' on your system.
> @@ -508,7 +485,7 @@
>  		$(UTIL) cp zdump.man $(MANDIR)/cat8/zdump.8
>  		$(UTIL) cp zic.man $(MANDIR)/cat8/zic.8
>
> -all:		tzselect host-zic zic$(EXEEXT) zdump$(EXEEXT) $(LIBOBJS)
> +all:		tzselect $(HOST_ZIC) zic$(EXEEXT) zdump$(EXEEXT) $(LIBOBJS)
>
>  ALL:		all date$(EXEEXT)
>
> @@ -517,18 +494,23 @@
>  		 echo 'static char const TZVERSION[]="$(VERSION)";' && \
>  		 echo 'static char const REPORT_BUGS_TO[]="$(BUGEMAIL)";') >$@
>
> -zdump$(EXEEXT):	$(TZDOBJS)
> -		$(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(TZDOBJS) $(LDLIBS)
> -		$(CROSS_STRIP) $@
> -
> -host-zic:	$(TZCSRCS) yearistype version.h
> +zdump$(EXEEXT):	$(TZDOBJS) $(TOPDIR)/lib/crt0.o $(TOPDIR)/lib/libc.a
> +		$(CROSS_LD) -s $(LDFLAGS) $(TOPDIR)/lib/crt0.o $(TZDOBJS) -o $@
> $(TOPDIR)/lib/libc.a $(LIBGCCA) -T $(DJGPP_DJL)
> +		$(TOPDIR)/hostbin/stubify.exe $@
> +
> +ifneq ($(CROSS_BUILD),1)
> +$(HOST_ZIC):	zic$(EXEEXT)
> +		$(UTIL) cp zic$(EXEEXT) $(HOST_ZIC)
> +else
> +$(HOST_ZIC):	$(TZCSRCS) yearistype version.h
>  		$(GCC) -DTZDIR=\"/dev/env/DJDIR~c:/djgpp~/zoneinfo\" \
>  		$(GCCFLAGS) $(LDFLAGS) $(TZCSRCS) $(LDLIBS) -o $@
>  		$(STRIP) $@
> +endif
>
> -zic$(EXEEXT):	$(TZCOBJS) yearistype
> -		$(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(TZCOBJS) $(LDLIBS)
> -		$(CROSS_STRIP) $@
> +zic$(EXEEXT):	$(TZCOBJS) $(TOPDIR)/lib/crt0.o $(TOPDIR)/lib/libc.a
> yearistype
> +		$(CROSS_LD) -s $(LDFLAGS) $(TOPDIR)/lib/crt0.o $(TZCOBJS) -o $@
> $(TOPDIR)/lib/libc.a $(LIBGCCA) -T $(DJGPP_DJL)
> +		$(TOPDIR)/hostbin/stubify.exe $@
>
>  yearistype:	yearistype.sh
>  		$(UTIL) cp yearistype.sh yearistype
> @@ -578,15 +560,9 @@
>  		-$(UTIL) mkdir $(LIBDIR)
>  		$(CROSS_AR) rus $@ $(LIBOBJS)
>
> -# We use the system's logwtmp in preference to ours if available.
> -
> -date$(EXEEXT):	$(DATEOBJS)
> -		$(CROSS_AR) rs logwtmpl.a logwtmp.o
> -		$(CC) $(CFLAGS) date.o localtime.o asctime.o strftime.o \
> -			$(LDLIBS) -lc logwtmpl.a -o $@
> -		$(CROSS_STRIP) $@
> -		$(UTIL) rm logwtmpl.a
> -		$(CROSS_STRIP) $@
> +date$(EXEEXT):	$(DATEOBJS) $(TOPDIR)/lib/crt0.o $(TOPDIR)/lib/libc.a
> +		$(CROSS_LD) -s $(LDFLAGS) $(TOPDIR)/lib/crt0.o $(DATEOBJS) -o $@
> $(TOPDIR)/lib/libc.a $(LIBGCCA) -T $(DJGPP_DJL)
> +		$(TOPDIR)/hostbin/stubify.exe $@
>
>  tzselect:	tzselect.ksh
>  		sed \
> @@ -611,7 +587,7 @@
>
>  clean_misc:
>  		$(UTIL) rm core *.o *.out tzselect zdump$(EXEEXT) zic$(EXEEXT) \
> -			yearistype date$(EXEEXT) logwtmpl* *.tar.gz host-zic *.exe *.man \
> +			yearistype date$(EXEEXT) logwtmpl* *.tar.gz $(HOST_ZIC) *.exe *.man \
>  			TDATA_list
>  clean:		clean_misc
>  		$(UTIL) rm -f -r tzpublic
>
> --
> O.S.
>

Applied

- Raw text -