public inbox for newlib-cvs@sourceware.org help / color / mirror / Atom feed
From: Michael Frysinger <vapier@sourceware.org> To: newlib-cvs@sourceware.org Subject: [newlib-cygwin] newlib: move version defines out of the config headers Date: Thu, 20 Jan 2022 01:57:34 +0000 (GMT) [thread overview] Message-ID: <20220120015734.C41EF3858D35@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=21fb1b461c29b61faf199ec2362ff9a53d6f01e6 commit 21fb1b461c29b61faf199ec2362ff9a53d6f01e6 Author: Mike Frysinger <vapier@gentoo.org> Date: Mon Jan 17 21:17:54 2022 -0500 newlib: move version defines out of the config headers This will make it easier to move newlib.h to use autoheader directly. We only want the newlib version defines in our hand curated version file, _newlib_version.h, not in the template header, newlib.h, so using AC_DEFINE doesn't make much sense. Diff: --- newlib/Makefile.in | 4 ++++ newlib/_newlib_version.hin | 16 +++++++++++----- newlib/configure | 16 ++++++---------- newlib/configure.ac | 10 ++++++---- 4 files changed, 27 insertions(+), 19 deletions(-) diff --git a/newlib/Makefile.in b/newlib/Makefile.in index 1af918059..267db9019 100644 --- a/newlib/Makefile.in +++ b/newlib/Makefile.in @@ -315,6 +315,10 @@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ NEWLIB_CFLAGS = @NEWLIB_CFLAGS@ +NEWLIB_MAJOR_VERSION = @NEWLIB_MAJOR_VERSION@ +NEWLIB_MINOR_VERSION = @NEWLIB_MINOR_VERSION@ +NEWLIB_PATCHLEVEL_VERSION = @NEWLIB_PATCHLEVEL_VERSION@ +NEWLIB_VERSION = @NEWLIB_VERSION@ NM = @NM@ NMEDIT = @NMEDIT@ NO_INCLUDE_LIST = @NO_INCLUDE_LIST@ diff --git a/newlib/_newlib_version.hin b/newlib/_newlib_version.hin index 03d4e3d47..077b81ecf 100644 --- a/newlib/_newlib_version.hin +++ b/newlib/_newlib_version.hin @@ -2,10 +2,16 @@ #ifndef _NEWLIB_VERSION_H__ #define _NEWLIB_VERSION_H__ 1 -#undef _NEWLIB_VERSION -#undef __NEWLIB__ -#undef __NEWLIB_MINOR__ -#undef __NEWLIB_PATCHLEVEL__ +/* The newlib version in string format. */ +#define _NEWLIB_VERSION "@NEWLIB_VERSION@" -#endif /* !_NEWLIB_VERSION_H__ */ +/* The newlib major version number. */ +#define __NEWLIB__ @NEWLIB_MAJOR_VERSION@ + +/* The newlib minor version number. */ +#define __NEWLIB_MINOR__ @NEWLIB_MINOR_VERSION@ +/* The newlib patch level. */ +#define __NEWLIB_PATCHLEVEL__ @NEWLIB_PATCHLEVEL_VERSION@ + +#endif /* !_NEWLIB_VERSION_H__ */ diff --git a/newlib/configure b/newlib/configure index 624ec89af..2be0a6c33 100755 --- a/newlib/configure +++ b/newlib/configure @@ -638,6 +638,10 @@ HAVE_LONG_DOUBLE_FALSE HAVE_LONG_DOUBLE_TRUE libc_cv_cc_loop_to_function libc_cv_initfinit_array +NEWLIB_PATCHLEVEL_VERSION +NEWLIB_MINOR_VERSION +NEWLIB_MAJOR_VERSION +NEWLIB_VERSION EXEEXT_FOR_BUILD CC_FOR_BUILD STDIO64_OBJECTLIST @@ -11970,7 +11974,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11973 "configure" +#line 11977 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12076,7 +12080,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12079 "configure" +#line 12083 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12572,16 +12576,8 @@ _ACEOF -$as_echo "#define _NEWLIB_VERSION \"4.2.0\"" >>confdefs.h -$as_echo "#define __NEWLIB__ 4" >>confdefs.h - - -$as_echo "#define __NEWLIB_MINOR__ 2" >>confdefs.h - - -$as_echo "#define __NEWLIB_PATCHLEVEL__ 0" >>confdefs.h if test "${multilib}" = "yes"; then diff --git a/newlib/configure.ac b/newlib/configure.ac index 35d94666a..e1fb2ad0e 100644 --- a/newlib/configure.ac +++ b/newlib/configure.ac @@ -477,10 +477,12 @@ if test "${newlib_mb}" = "yes"; then fi AC_DEFINE_UNQUOTED(_MB_LEN_MAX, $_mb_len_max, [Multibyte max length.]) -AC_DEFINE(_NEWLIB_VERSION, "NEWLIB_VERSION", [The newlib version in string format.]) -AC_DEFINE(__NEWLIB__, NEWLIB_MAJOR_VERSION, [The newlib major version number.]) -AC_DEFINE(__NEWLIB_MINOR__, NEWLIB_MINOR_VERSION, [The newlib minor version number.]) -AC_DEFINE(__NEWLIB_PATCHLEVEL__, NEWLIB_PATCHLEVEL_VERSION, [The newlib patch level.]) +dnl These are AC_SUBST instead of AC_DEFINE as they're hand maintained in a +dnl dedicated _newlib_version.h, and we don't want them in newlib.h. +AC_SUBST([NEWLIB_VERSION]) +AC_SUBST([NEWLIB_MAJOR_VERSION]) +AC_SUBST([NEWLIB_MINOR_VERSION]) +AC_SUBST([NEWLIB_PATCHLEVEL_VERSION]) if test "${multilib}" = "yes"; then multilib_arg="--enable-multilib"
reply other threads:[~2022-01-20 1:57 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=20220120015734.C41EF3858D35@sourceware.org \ --to=vapier@sourceware.org \ --cc=newlib-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).