From e4d04cb30606e18f561a56cab7559ca59a15b6ec Mon Sep 17 00:00:00 2001 From: Vladimir Mezentsev Date: Mon, 18 Jul 2022 09:57:34 -0700 Subject: gprofng: fix regression in build and a race condition in autoreconf gprofng/ChangeLog 2022-07-14 Vladimir Mezentsev PR gprofng/29338 * libcollector/configure.ac (AC_CONFIG_HEADERS): Fix a race condition. * libcollector/configure: Rebuild. * libcollector/Makefile.in: Rebuild. * common/config.h.in: Rebuild. * common/lib-config.h.in: Created by autoreconf. --- gprofng/common/lib-config.h.in | 94 +++++++++++++++++++++++++++++++++++++++ gprofng/libcollector/Makefile.in | 6 +-- gprofng/libcollector/configure | 5 ++- gprofng/libcollector/configure.ac | 3 +- 4 files changed, 102 insertions(+), 6 deletions(-) create mode 100644 gprofng/common/lib-config.h.in diff --git a/gprofng/common/lib-config.h.in b/gprofng/common/lib-config.h.in new file mode 100644 index 0000000..da7d81b --- /dev/null +++ b/gprofng/common/lib-config.h.in @@ -0,0 +1,94 @@ +/* ../common/lib-config.h.in. Generated from configure.ac by autoheader. */ + +/* Define to 1 if you have the header file. */ +#undef HAVE_DLFCN_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_INTTYPES_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_MEMORY_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STDINT_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STDLIB_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STRINGS_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STRING_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_STAT_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_TYPES_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_UNISTD_H + +/* Define to the sub-directory in which libtool stores uninstalled libraries. + */ +#undef LT_OBJDIR + +/* Name of package */ +#undef PACKAGE + +/* Define to the address where bug reports for this package should be sent. */ +#undef PACKAGE_BUGREPORT + +/* Define to the full name of this package. */ +#undef PACKAGE_NAME + +/* Define to the full name and version of this package. */ +#undef PACKAGE_STRING + +/* Define to the one symbol short name of this package. */ +#undef PACKAGE_TARNAME + +/* Define to the home page for this package. */ +#undef PACKAGE_URL + +/* Define to the version of this package. */ +#undef PACKAGE_VERSION + +/* Define to 1 if you have the ANSI C header files. */ +#undef STDC_HEADERS + +/* Enable extensions on AIX 3, Interix. */ +#ifndef _ALL_SOURCE +# undef _ALL_SOURCE +#endif +/* Enable GNU extensions on systems that have them. */ +#ifndef _GNU_SOURCE +# undef _GNU_SOURCE +#endif +/* Enable threading extensions on Solaris. */ +#ifndef _POSIX_PTHREAD_SEMANTICS +# undef _POSIX_PTHREAD_SEMANTICS +#endif +/* Enable extensions on HP NonStop. */ +#ifndef _TANDEM_SOURCE +# undef _TANDEM_SOURCE +#endif +/* Enable general extensions on Solaris. */ +#ifndef __EXTENSIONS__ +# undef __EXTENSIONS__ +#endif + + +/* Version number of package */ +#undef VERSION + +/* Define to 1 if on MINIX. */ +#undef _MINIX + +/* Define to 2 if the system does not provide POSIX.1 features except with + this defined. */ +#undef _POSIX_1_SOURCE + +/* Define to 1 if you need to in order for `stat' and other things to work. */ +#undef _POSIX_SOURCE diff --git a/gprofng/libcollector/Makefile.in b/gprofng/libcollector/Makefile.in index e8b2aab..9372c6d 100644 --- a/gprofng/libcollector/Makefile.in +++ b/gprofng/libcollector/Makefile.in @@ -274,7 +274,7 @@ am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/../../ar-lib \ $(top_srcdir)/../../config.sub $(top_srcdir)/../../depcomp \ $(top_srcdir)/../../install-sh $(top_srcdir)/../../ltmain.sh \ $(top_srcdir)/../../missing $(top_srcdir)/../../mkinstalldirs \ - $(top_srcdir)/../common/config.h.in ../../COPYING \ + $(top_srcdir)/../common/lib-config.h.in ../../COPYING \ ../../COPYING.LIB ../../ChangeLog ../../README ../../ar-lib \ ../../compile ../../config.guess ../../config.rpath \ ../../config.sub ../../depcomp ../../install-sh \ @@ -518,10 +518,10 @@ lib-config.h: stamp-h1 @test -f $@ || rm -f stamp-h1 @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1 -stamp-h1: $(top_srcdir)/../common/config.h.in $(top_builddir)/config.status +stamp-h1: $(top_srcdir)/../common/lib-config.h.in $(top_builddir)/config.status @rm -f stamp-h1 cd $(top_builddir) && $(SHELL) ./config.status lib-config.h -$(top_srcdir)/../common/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +$(top_srcdir)/../common/lib-config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) ($(am__cd) $(top_srcdir) && $(AUTOHEADER)) rm -f stamp-h1 touch $@ diff --git a/gprofng/libcollector/configure b/gprofng/libcollector/configure index 9209a79..bd40838 100755 --- a/gprofng/libcollector/configure +++ b/gprofng/libcollector/configure @@ -15553,7 +15553,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu ac_config_files="$ac_config_files Makefile" -ac_config_headers="$ac_config_headers lib-config.h:../common/config.h.in" +ac_config_headers="$ac_config_headers lib-config.h:../common/lib-config.h.in" + cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -16655,7 +16656,7 @@ do "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; - "lib-config.h") CONFIG_HEADERS="$CONFIG_HEADERS lib-config.h:../common/config.h.in" ;; + "lib-config.h") CONFIG_HEADERS="$CONFIG_HEADERS lib-config.h:../common/lib-config.h.in" ;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac diff --git a/gprofng/libcollector/configure.ac b/gprofng/libcollector/configure.ac index d3c6bd5..a19e620 100644 --- a/gprofng/libcollector/configure.ac +++ b/gprofng/libcollector/configure.ac @@ -62,6 +62,7 @@ ACX_PROG_CC_WARNING_OPTS([-Wno-nonnull-compare], [GPROFNG_NO_NONNULL_COMPARE_CFL AC_SUBST(GPROFNG_NO_NONNULL_COMPARE_CFLAGS) AC_CONFIG_FILES([Makefile]) -AC_CONFIG_HEADERS([lib-config.h:../common/config.h.in]) +AC_CONFIG_HEADERS([lib-config.h:../common/lib-config.h.in]) + AC_OUTPUT -- cgit v1.1