database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-10-24 01:29:19 +03:00
Code Activity

meson: ecpg: Split definition of static and shared libraries

Browse Source 
Required for correct resource file generation, as the resource files should
only be added to the shared library.

This also fixes a bunch of issues in the .pc files.

Previously I tried to avoid building sources twice, once for the static and
once for the shared libraries. We could still do so, but it's not clear that
it's worth the complication.

Reviewed-by: Peter Eisentraut <peter.eisentraut@enterprisedb.com>
Discussion: https://postgr.es/m/20220927011951.j3h4o7n6bhf7dwau@awork3.anarazel.de
This commit is contained in:
Andres Freund
2022-10-05 09:56:05 -07:00
parent 089c0bc7a7
commit a1261cd16f
4 changed files with 78 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/interfaces/ecpg/ecpglib/meson.build
View File

@@ -10,15 +10,29 @@ ecpglib_sources = files(
'sqlda.c',
'typename.c',
)
ecpglib_so_sources = [] # for shared lib, in addition to the above
export_file = custom_target('libpq.exports', kwargs: gen_export_kwargs)
ecpglib_inc = [include_directories('.'), ecpg_inc]
ecpglib_c_args = ['-DSO_MAJOR_VERSION=6']
export_file = custom_target('libecpg.exports', kwargs: gen_export_kwargs)
ecpglib = both_libraries('libecpg',
# see src/interfaces/libpq/meson.build
ecpglib_st = static_library('libecpg',
ecpglib_sources,
include_directories: ['.', ecpg_inc, postgres_inc],
c_args: ['-DSO_MAJOR_VERSION=6'],
dependencies: [frontend_code, libpq, thread_dep],
link_with: [ecpg_pgtypes],
include_directories: ecpglib_inc,
c_args: ecpglib_c_args,
dependencies: [frontend_stlib_code, thread_dep, libpq],
link_with: [ecpg_pgtypes_st],
kwargs: default_lib_args,
)
ecpg_targets += ecpglib_st
ecpglib_so = shared_library('libecpg',
ecpglib_sources + ecpglib_so_sources,
include_directories: ecpglib_inc,
c_args: ecpglib_c_args,
dependencies: [frontend_shlib_code, libpq, thread_dep],
link_with: ecpg_pgtypes_so,
soversion: host_system != 'windows' ? '6' : '',
darwin_versions: ['6', '6.' + pg_version_major.to_string()],
version: '6.' + pg_version_major.to_string(),
@@ -26,12 +40,15 @@ ecpglib = both_libraries('libecpg',
link_depends: export_file,
kwargs: default_lib_args,
)
ecpg_targets += [ecpglib.get_shared_lib(), ecpglib.get_static_lib()]
ecpg_targets += ecpglib_so
pkgconfig.generate(
ecpglib.get_shared_lib(),
name: 'libecpg',
description: 'PostgreSQL libecpg library',
url: pg_url,
libraries: ecpglib_so,
libraries_private: [frontend_shlib_code, thread_dep],
requires_private: ['libpgtypes', 'libpq'],
)
subdir('po', if_found: libintl)