diff options
| author | Vladimir Mezentsev <vladimir.mezentsev@oracle.com> | 2022-07-18 09:57:34 -0700 |
|---|---|---|
| committer | Vladimir Mezentsev <vladimir.mezentsev@oracle.com> | 2022-07-18 10:41:10 -0700 |
| commit | e4d04cb30606e18f561a56cab7559ca59a15b6ec (patch) | |
| tree | f091bfe6e9887d25169c901c321ec814b1d1cbd9 /gprofng/libcollector | |
| parent | 0b4fe76f956293778f109764911a0b14dc944f5d (diff) | |
| download | gdb-e4d04cb30606e18f561a56cab7559ca59a15b6ec.zip gdb-e4d04cb30606e18f561a56cab7559ca59a15b6ec.tar.gz gdb-e4d04cb30606e18f561a56cab7559ca59a15b6ec.tar.bz2 | |
gprofng: fix regression in build and a race condition in autoreconf
gprofng/ChangeLog
2022-07-14 Vladimir Mezentsev <vladimir.mezentsev@oracle.com>
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.
Diffstat (limited to 'gprofng/libcollector')
| -rw-r--r-- | gprofng/libcollector/Makefile.in | 6 | ||||
| -rwxr-xr-x | gprofng/libcollector/configure | 5 | ||||
| -rw-r--r-- | gprofng/libcollector/configure.ac | 3 |
3 files changed, 8 insertions, 6 deletions
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 |