NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit4b4b346

committed

meson: portname was set too early

portname is set to host_system, but host_system might still be changedlater in the file. As a consequence, platforms where host_system ischanged later wouldn't find some of their platform-specific files(driven by portname), and the build would fail. Move the assignmentof portname further down after the last change of host_system (butbefore further overriding assignments to portname).Discussion:https://www.postgresql.org/message-id/flat/CAC7zN94TdsHhY88XkroJzSMx7E%3DBQpV9LKKjNSEnTM04ihoWCA%40mail.gmail.com

1 parent21ef4d4 commit4b4b346Copy full SHA for 4b4b346

File tree

1 file changed

-6

lines changed

meson.build

1 file changed

-6

lines changed

`‎meson.build`

Lines changed: 6 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -159,12 +159,6 @@ cdata.set_quoted('CONFIGURE_ARGS', '')`
`159`	`159`	`# Basic platform specific configuration`
`160`	`160`	`###############################################################`
`161`	`161`
`162`		`-# meson's system names don't quite map to our "traditional" names. In some`
`163`		`-# places we need the "traditional" name, e.g., for mapping`
`164`		`-# src/include/port/$os.h to src/include/pg_config_os.h. Define portname for`
`165`		`-# that purpose.`
`166`		`-portname= host_system`
`167`		`-`
`168`	`162`	`exesuffix=''# overridden below where necessary`
`169`	`163`	`dlsuffix='.so'# overridden below where necessary`
`170`	`164`	`library_path_var='LD_LIBRARY_PATH'`
`@@ -192,6 +186,12 @@ if host_system == 'dragonfly'`
`192`	`186`	`host_system='netbsd'`
`193`	`187`	`endif`
`194`	`188`
	`189`	`+# meson's system names don't quite map to our "traditional" names. In some`
	`190`	`+# places we need the "traditional" name, e.g., for mapping`
	`191`	`+# src/include/port/$os.h to src/include/pg_config_os.h. Define portname for`
	`192`	`+# that purpose.`
	`193`	`+portname= host_system`
	`194`	`+`
`195`	`195`	`if host_system=='aix'`
`196`	`196`	`library_path_var='LIBPATH'`
`197`	`197`

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!

Commit4b4b346

File tree

1 file changed

1 file changed

`‎meson.build`

0 commit comments