Commitbb5fe04

tglsfdc

authored and

pull[bot]

committed

Increase minimum supported GNU make version to 3.81.

We've long held the minimum at 3.80, but that's required more thanone workaround. Commit0f39b70 broke it again, because it turnsout that exporting a target-specific variable didn't work in 3.80.Considering that 3.81 is now old enough to get a driver's license,and that the only remaining buildfarm member testing 3.80 (prairiedog)is likely to be retired soon, let's just stop supporting 3.80.Adjust docs and Makefile.global's minimum-version check to match.There are a couple of comments in the Makefiles suggesting thatrandom things could be done differently after we desupport 3.80,but I couldn't get excited about changing any of them right now.Back-patch to v15, as0f39b70 was.Discussion:https://postgr.es/m/20220720172321.GL12702@telsasoft.com

1 parentc279289 commitbb5fe04Copy full SHA for bb5fe04

File tree

2 files changed

-8

lines changed

doc/src/sgml
- installation.sgml
src
- Makefile.global.in

2 files changed

-8

lines changed

`‎doc/src/sgml/installation.sgml`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ su - postgres`
`77`	`77`	`<primary>make</primary>`
`78`	`78`	`</indexterm>`
`79`	`79`
`80`		`- <acronym>GNU</acronym> <application>make</application> version 3.80 or newer is required; other`
	`80`	`+ <acronym>GNU</acronym> <application>make</application> version 3.81 or newer is required; other`
`81`	`81`	`<application>make</application> programs or older <acronym>GNU</acronym> <application>make</application> versions will <emphasis>not</emphasis> work.`
`82`	`82`	`(<acronym>GNU</acronym> <application>make</application> is sometimes installed under`
`83`	`83`	`the name <filename>gmake</filename>.) To test for <acronym>GNU</acronym>`

`‎src/Makefile.global.in`

Lines changed: 6 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -635,7 +635,6 @@ submake-libpgfeutils: \| submake-generated-headers`
`635`	`635`
`636`	`636`	`ifneq ($(USE_MODULE_DB),)`
`637`	`637`	`PL_TESTDB = pl_regression_$(NAME)`
`638`		`-# Replace this with $(or ...) if we ever require GNU make 3.81.`
`639`	`638`	`ifneq ($(MODULE_big),)`
`640`	`639`	`CONTRIB_TESTDB=contrib_regression_$(MODULE_big)`
`641`	`640`	`ISOLATION_TESTDB=isolation_regression_$(MODULE_big)`
`@@ -872,19 +871,19 @@ install-strip:`
`872`	`871`	`# allows parallel make across directories and lets make -k and -q work`
`873`	`872`	`# correctly.`
`874`	`873`
`875`		`-# We need the$(eval) function and order-only prerequisites, whichare`
`876`		`-#available in GNU make 3.80. That also happens to be the version`
`877`		`-# where the .VARIABLES variable was introduced, so this is a simple check.`
`878`		`-ifndef.VARIABLES`
`879`		`-$(error GNU make 3.80 or newer is required. You are using version $(MAKE_VERSION))`
	`874`	`+# We need theability to export target-specific variables, whichwas`
	`875`	`+#added in GNU make 3.81. That also happens to be the version`
	`876`	`+# where the .FEATURES variable was introduced, so this is a simple check.`
	`877`	`+ifndef.FEATURES`
	`878`	`+$(error GNU make 3.81 or newer is required. You are using version $(MAKE_VERSION))`
`880`	`879`	`endif`
`881`	`880`
`882`	`881`	`# This function is only for internal use below. It should be called`
`883`	`882`	`# using $(eval). It will set up a target so that it recurses into a`
`884`	`883`	`# given subdirectory. For the tree-wide all/install/check/installcheck cases,`
`885`	`884`	`# ensure we do our one-time tasks before recursing (see targets above).`
`886`	`885`	`# Note that to avoid a nasty bug in make 3.80,`
`887`		`-# this functionhastoavoid using any complicated constructs (like`
	`886`	`+# this functionwas writtentonot use any complicated constructs (like`
`888`	`887`	`# multiple targets on a line) and also not contain any lines that expand`
`889`	`888`	`# to more than about 200 bytes. This is why we make it apply to just one`
`890`	`889`	`# subdirectory at a time, rather than to a list of subdirectories.`

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!

Commitbb5fe04

File tree

2 files changed

2 files changed

`‎doc/src/sgml/installation.sgml`

`‎src/Makefile.global.in`

0 commit comments