public inbox for cygwin-cvs@sourceware.org help / color / mirror / Atom feed
From: Corinna Vinschen <corinna@sourceware.org> To: cygwin-cvs@sourceware.org Subject: [newlib-cygwin] Cygwin: revamp localtime.o build rule Date: Tue, 26 May 2020 08:20:54 +0000 (GMT) [thread overview] Message-ID: <20200526082054.4C7163895445@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=4d5efe1e1d3dc7672934efce1bdc9151e7cd307d commit 4d5efe1e1d3dc7672934efce1bdc9151e7cd307d Author: Corinna Vinschen <corinna@vinschen.de> Date: Mon May 25 17:40:27 2020 +0200 Cygwin: revamp localtime.o build rule Rename localtime.c.patched to localtime.patched.c to keep the correct language suffix. Create localtime.patched.c in the build dir rather than in the source dir. Decouple the build rule for creating localtime.patched.c from the rule to build localtime.o, so we don't have to rebuild the patched source file all the time. Signed-off-by: Corinna Vinschen <corinna@vinschen.de> Diff: --- winsup/cygwin/Makefile.in | 11 +++++++---- winsup/cygwin/tzcode/localtime_wrapper.c | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/winsup/cygwin/Makefile.in b/winsup/cygwin/Makefile.in index 1801b1a11..3a175c61c 100644 --- a/winsup/cygwin/Makefile.in +++ b/winsup/cygwin/Makefile.in @@ -670,7 +670,7 @@ uninstall-man: done clean distclean realclean: - -rm -f *.o *.dll *.dbg *.a *.exp junk *.base version.cc *.exe *.d *stamp* *_magic.h sigfe.s cygwin.def globals.h + -rm -f *.o *.dll *.dbg *.a *.exp junk *.base version.cc *.exe *.d *stamp* *_magic.h sigfe.s cygwin.def globals.h localtime.patched.c -@$(MAKE) -C ${cygserver_blddir} libclean maintainer-clean: clean @@ -734,9 +734,12 @@ dcrt0.o sigproc.o: child_info_magic.h shared.o: shared_info_magic.h -localtime.o: $(srcdir)/tzcode/localtime_wrapper.c $(srcdir)/tzcode/localtime.c.patch - (cd $(srcdir)/tzcode && \ - patch -u -o localtime.c.patched localtime.c localtime.c.patch) +localtime.patched.c: tzcode/localtime.c tzcode/localtime.c.patch + patch -u -o localtime.patched.c \ + $(srcdir)/tzcode/localtime.c \ + $(srcdir)/tzcode/localtime.c.patch + +localtime.o: tzcode/localtime_wrapper.c localtime.patched.c $(CC) ${COMMON_CFLAGS} ${localtime_CFLAGS} \ -I$(target_builddir)/winsup/cygwin \ -I$(srcdir) -I$(srcdir)/tzcode -c -o $@ $< diff --git a/winsup/cygwin/tzcode/localtime_wrapper.c b/winsup/cygwin/tzcode/localtime_wrapper.c index 72e2f93ab..1c7cd928d 100644 --- a/winsup/cygwin/tzcode/localtime_wrapper.c +++ b/winsup/cygwin/tzcode/localtime_wrapper.c @@ -122,7 +122,7 @@ tzgetwintzi (char *wildabbr, char *outbuf) (2) add conditional call to Cygwin's tzgetwintzi() from tzsetlcl() (3) add Cygwin's historical "posixrules" support to tzloadbody() */ -#include "localtime.c.patched" +#include "localtime.patched.c" // Don't forget these Cygwin-specific additions from this point to EOF EXPORT_ALIAS (tzset_unlocked, _tzset_unlocked)
reply other threads:[~2020-05-26 8:20 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20200526082054.4C7163895445@sourceware.org \ --to=corinna@sourceware.org \ --cc=cygwin-cvs@sourceware.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).