NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit089c0bc

committed

meson: libpq: Revise static / shared library setup

Improvements:- we don't need -DFRONTEND for libpq anymore since1d77afe- the .pc file contents for a static libpq were wrong (referencing {pgport, common}_shlib)- incidentally fixes meson not supporting link_whole on AIX yet- added explanatory commentsPreviously I tried to avoid building libpq's sources twice, once for thestatic and once for the shared library. We could still do so, but it's notclear that it's worth the complication.Reviewed-by: Peter Eisentraut <peter.eisentraut@enterprisedb.com>

1 parent29668e3 commit089c0bcCopy full SHA for 089c0bc

File tree

2 files changed

+36

-15

lines changed

meson.build
src/interfaces/libpq
- meson.build

2 files changed

+36

-15

lines changed

`‎meson.build`

Lines changed: 18 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -2619,17 +2619,29 @@ backend_common_code = declare_dependency(`
`2619`	`2619`
`2620`	`2620`	`subdir('src/common')`
`2621`	`2621`
`2622`		`-frontend_shlib_code=declare_dependency(`
`2623`		`-compile_args: ['-DFRONTEND'],`
`2624`		`-include_directories: [postgres_inc],`
	`2622`	`+# all shared libraries should depend on shlib_code`
	`2623`	`+shlib_code=declare_dependency(`
`2625`	`2624`	`link_args: ldflags_sl,`
`2626`		`-link_with: [pgport_shlib, common_shlib],`
	`2625`	`+)`
	`2626`	`+`
	`2627`	`+# all static libraries not part of the backend should depend on this`
	`2628`	`+frontend_stlib_code=declare_dependency(`
	`2629`	`+include_directories: [postgres_inc],`
	`2630`	`+link_with: [common_static, pgport_static],`
`2627`	`2631`	`sources: generated_headers,`
`2628`	`2632`	`dependencies: [os_deps, libintl],`
`2629`	`2633`	`)`
`2630`	`2634`
	`2635`	`+# all shared libraries not part of the backend should depend on this`
	`2636`	`+frontend_shlib_code=declare_dependency(`
	`2637`	`+include_directories: [postgres_inc],`
	`2638`	`+link_with: [common_shlib, pgport_shlib],`
	`2639`	`+sources: generated_headers,`
	`2640`	`+dependencies: [shlib_code, os_deps, libintl],`
	`2641`	`+)`
	`2642`	`+`
	`2643`	`+# Dependencies both for static and shared libpq`
`2631`	`2644`	`libpq_deps+= [`
`2632`		`- frontend_shlib_code,`
`2633`	`2645`	`thread_dep,`
`2634`	`2646`
`2635`	`2647`	`gssapi,`
`@@ -2642,6 +2654,7 @@ subdir('src/interfaces/libpq')`
`2642`	`2654`	`# fe_utils depends on libpq`
`2643`	`2655`	`subdir('src/fe_utils')`
`2644`	`2656`
	`2657`	`+# for frontend binaries`
`2645`	`2658`	`frontend_code=declare_dependency(`
`2646`	`2659`	`include_directories: [postgres_inc],`
`2647`	`2660`	`link_with: [fe_utils, common_static, pgport_static],`

`‎src/interfaces/libpq/meson.build`

Lines changed: 18 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -39,26 +39,33 @@ export_file = custom_target('libpq.exports',`
`39`	`39`
`40`	`40`	`# port needs to be in include path due to pthread-win32.h`
`41`	`41`	`libpq_inc=include_directories('.','../../port')`
	`42`	`+libpq_c_args= ['-DSO_MAJOR_VERSION=5']`
`42`	`43`
	`44`	`+# Not using both_libraries() here as`
	`45`	`+# 1) resource files should only be in the shared library`
	`46`	`+# 2) we want the .pc file to include a dependency to {pgport,common}_static for`
	`47`	`+# libpq_st, and {pgport,common}_shlib for libpq_sh`
	`48`	`+#`
	`49`	`+# We could try to avoid building the source files twice, but it probably adds`
	`50`	`+# more complexity than its worth (AIX doesn't support link_whole yet, reusing`
	`51`	`+# object files requires also linking to the library on windows or breaks`
	`52`	`+# precompiled headers).`
`43`	`53`	`libpq_st=static_library('libpq',`
`44`	`54`	`libpq_sources,`
`45`		`-pic:true,`
`46`		`-include_directories: [libpq_inc, postgres_inc],`
`47`		`-c_args: ['-DSO_MAJOR_VERSION=5'],`
`48`		`-dependencies: libpq_deps,`
	`55`	`+include_directories: [libpq_inc],`
	`56`	`+c_args: libpq_c_args,`
	`57`	`+dependencies: [frontend_stlib_code, libpq_deps],`
`49`	`58`	`kwargs: default_lib_args,`
`50`	`59`	`)`
`51`	`60`
`52`		`-# not using both_libraries here, causes problems with precompiled headers and`
`53`		`-# resource files with msbuild`
`54`	`61`	`libpq_so=shared_library('libpq',`
`55`		`-dependencies: libpq_deps,`
	`62`	`+libpq_sources,`
`56`	`63`	`include_directories: [libpq_inc, postgres_inc],`
`57`		`-c_args: ['-DSO_MAJOR_VERSION=5'],`
`58`		`-link_whole: libpq_st,`
	`64`	`+c_args: libpq_c_args,`
`59`	`65`	`version:'5.'+ pg_version_major.to_string(),`
`60`	`66`	`soversion: host_system!='windows' ?'5' :'',`
`61`	`67`	`darwin_versions: ['5','5.'+ pg_version_major.to_string()],`
	`68`	`+dependencies: [frontend_shlib_code, libpq_deps],`
`62`	`69`	`link_depends: export_file,`
`63`	`70`	`link_args: export_fmt.format(export_file.full_path()),`
`64`	`71`	`kwargs: default_lib_args,`
`@@ -70,10 +77,11 @@ libpq = declare_dependency(`
`70`	`77`	`)`
`71`	`78`
`72`	`79`	`pkgconfig.generate(`
`73`		`- libpq_so,`
`74`	`80`	`name:'libpq',`
`75`	`81`	`description:'PostgreSQL libpq library',`
`76`	`82`	`url: pg_url,`
	`83`	`+libraries: libpq,`
	`84`	`+libraries_private: [frontend_stlib_code, libpq_deps],`
`77`	`85`	`)`
`78`	`86`
`79`	`87`	`install_headers(`

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!

Commit089c0bc

File tree

2 files changed

2 files changed

`‎meson.build`

`‎src/interfaces/libpq/meson.build`

0 commit comments