NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit52f4461

committed

Fix make headerscheck

In the wake of commitsdac048f andecaf7c5, `make headerscheck`no longer generated all headers that are included by other headers,causing headerscheck/cpluspluscheck to fail. To fix, backpatch enoughmakefile rules from721856f to generate all required headers.Reported by Marina PolyakovaBackpatch to version 16 only, as the issue is not present on masterDiscussion:https://postgr.es/m/231ea1127719b2b3d6d1c05f75808981%40postgrespro.ru

1 parent2209c70 commit52f4461Copy full SHA for 52f4461

File tree

2 files changed

-3

lines changed

src/backend
- Makefile
- utils
  - Makefile

2 files changed

-3

lines changed

`‎src/backend/Makefile`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -160,7 +160,7 @@ submake-utils-headers:`
`160`	`160`
`161`	`161`	`.PHONY: generated-headers`
`162`	`162`
`163`		`-generated-headers:$(top_builddir)/src/include/storage/lwlocknames.h submake-catalog-headers submake-nodes-headers submake-utils-headers`
	`163`	`+generated-headers:$(top_builddir)/src/include/storage/lwlocknames.h submake-catalog-headers submake-nodes-headers submake-utils-headers parser/gram.h`
`164`	`164`
`165`	`165`	`$(top_builddir)/src/include/storage/lwlocknames.h: storage/lmgr/lwlocknames.h`
`166`	`166`	prereqdir=`cd'$(dir $<)'>/dev/null&& pwd`&&\

`‎src/backend/utils/Makefile`

Lines changed: 5 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -38,9 +38,12 @@ all: distprep probes.h generated-header-symlinks`
`38`	`38`
`39`	`39`	`distprep: fmgr-stamp errcodes.h`
`40`	`40`
`41`		`-.PHONY: generated-header-symlinks`
	`41`	`+.PHONY: generated-header-symlinks submake-adt-headers`
`42`	`42`
`43`		`-generated-header-symlinks:$(top_builddir)/src/include/utils/header-stamp$(top_builddir)/src/include/utils/probes.h`
	`43`	`+generated-header-symlinks:$(top_builddir)/src/include/utils/header-stamp$(top_builddir)/src/include/utils/probes.h submake-adt-headers`
	`44`	`+`
	`45`	`+submake-adt-headers:`
	`46`	`+$(MAKE) -C adt jsonpath_gram.h`
`44`	`47`
`45`	`48`	`$(SUBDIRS:%=%-recursive): fmgr-stamp errcodes.h`
`46`	`49`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit52f4461

File tree

2 files changed

2 files changed

`‎src/backend/Makefile`

`‎src/backend/utils/Makefile`

0 commit comments