diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2022-01-18 04:10:38 +0300 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2022-01-20 03:59:16 +0300 |
| commit | 0a67325726577e189c65e7c190f3f9e0874143a6 (patch) | |
| tree | 89a129513dbd797f6086a993d36526e0d6487ff9 /newlib/configure | |
| parent | b86dc2dab4981ba92d683b866badc0b32be39120 (diff) | |
newlib: switch newlib.h to autoheader
Now that newlib.hin has been brought up to date and all of its defines
are produced by configure, we can switch it to using autoheader without
manual editing. This relies on a few pieces:
* Moving the header & footer into configure.ac via AH_TOP & AH_BOTTOM.
* Running a post-process step on newlib.h to delete all the defines we
didn't export ourselves. Basically, anything without a _ prefix.
This will leave behind some spurious comments in newlib.h related to
the defines we filtered out, but should be harmless, so it's probably
not worth the effort to construct a more complicated sed expression to
also strip those out.
Diffstat (limited to 'newlib/configure')
| -rwxr-xr-x | newlib/configure | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/newlib/configure b/newlib/configure index 5a0993c85..879392da8 100755 --- a/newlib/configure +++ b/newlib/configure @@ -2251,7 +2251,13 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -ac_config_headers="$ac_config_headers _newlib_version.h:_newlib_version.hin newlib.h:newlib.hin" + +ac_config_headers="$ac_config_headers newlib.h:newlib.hin" + + + + +ac_config_headers="$ac_config_headers _newlib_version.h:_newlib_version.hin" ac_aux_dir= @@ -11974,7 +11980,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11977 "configure" +#line 11983 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12080,7 +12086,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12083 "configure" +#line 12089 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -14451,8 +14457,8 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 for ac_config_target in $ac_config_targets do case $ac_config_target in - "_newlib_version.h") CONFIG_HEADERS="$CONFIG_HEADERS _newlib_version.h:_newlib_version.hin" ;; "newlib.h") CONFIG_HEADERS="$CONFIG_HEADERS newlib.h:newlib.hin" ;; + "_newlib_version.h") CONFIG_HEADERS="$CONFIG_HEADERS _newlib_version.h:_newlib_version.hin" ;; "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; @@ -15051,6 +15057,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;} case $ac_file$ac_mode in + "newlib.h":H) sed -i.tmp -e '/^#define [^_]/d' -e '/^\/\* #undef [^_]/d' newlib.h && rm -f newlib.h.tmp ;; "depfiles":C) test x"$AMDEP_TRUE" != x"" || { # Older Autoconf quotes --file arguments for eval, but not when files # are listed without --file. Let's play safe and only enable the eval |