Skip to content

Commit ab277e1

Browse files
committed
meson: add generated header stamps
1 parent ea339fa commit ab277e1

File tree

4 files changed

+24
-8
lines changed

4 files changed

+24
-8
lines changed

meson.build

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2696,6 +2696,8 @@ gen_export_kwargs = {
26962696
'install': false,
26972697
}
26982698

2699+
# command to create stamp files on all OSs
2700+
stamp_cmd = [python, '-c', 'import sys; open(sys.argv[1], "w")', '@OUTPUT0@']
26992701

27002702

27012703
###
@@ -2799,14 +2801,14 @@ subdir('src/port')
27992801
frontend_common_code = declare_dependency(
28002802
compile_args: ['-DFRONTEND'],
28012803
include_directories: [postgres_inc],
2802-
sources: generated_headers,
2804+
sources: generated_headers_stamp,
28032805
dependencies: [os_deps, zlib, zstd],
28042806
)
28052807

28062808
backend_common_code = declare_dependency(
28072809
compile_args: ['-DBUILDING_DLL'],
28082810
include_directories: [postgres_inc],
2809-
sources: generated_headers,
2811+
sources: generated_headers_stamp,
28102812
dependencies: [os_deps, zlib, zstd],
28112813
)
28122814

@@ -2821,15 +2823,15 @@ shlib_code = declare_dependency(
28212823
frontend_stlib_code = declare_dependency(
28222824
include_directories: [postgres_inc],
28232825
link_with: [common_static, pgport_static],
2824-
sources: generated_headers,
2826+
sources: generated_headers_stamp,
28252827
dependencies: [os_deps, libintl],
28262828
)
28272829

28282830
# all shared libraries not part of the backend should depend on this
28292831
frontend_shlib_code = declare_dependency(
28302832
include_directories: [postgres_inc],
28312833
link_with: [common_shlib, pgport_shlib],
2832-
sources: generated_headers,
2834+
sources: generated_headers_stamp,
28332835
dependencies: [shlib_code, os_deps, libintl],
28342836
)
28352837

@@ -2851,7 +2853,7 @@ subdir('src/fe_utils')
28512853
frontend_code = declare_dependency(
28522854
include_directories: [postgres_inc],
28532855
link_with: [fe_utils, common_static, pgport_static],
2854-
sources: generated_headers,
2856+
sources: generated_headers_stamp,
28552857
dependencies: [os_deps, libintl],
28562858
)
28572859

@@ -2879,7 +2881,7 @@ backend_code = declare_dependency(
28792881
include_directories: [postgres_inc],
28802882
link_args: ldflags_be,
28812883
link_with: [],
2882-
sources: generated_headers + generated_backend_headers,
2884+
sources: [generated_backend_headers_stamp],
28832885
dependencies: os_deps + backend_both_deps + backend_deps,
28842886
)
28852887

src/backend/meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ backend_mod_code = declare_dependency(
176176
compile_args: pg_mod_c_args,
177177
include_directories: postgres_inc,
178178
link_args: pg_mod_link_args,
179-
sources: generated_headers + generated_backend_headers,
179+
sources: [generated_backend_headers_stamp],
180180
dependencies: backend_mod_deps,
181181
)
182182

src/fe_utils/meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ generated_sources += psqlscan
2424
fe_utils_sources += psqlscan
2525

2626
fe_utils = static_library('libpgfeutils',
27-
fe_utils_sources + generated_headers,
27+
fe_utils_sources,
2828
c_pch: pch_postgres_fe_h,
2929
include_directories: [postgres_inc, libpq_inc],
3030
c_args: host_system == 'windows' ? ['-DFD_SETSIZE=1024'] : [],

src/include/meson.build

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,3 +186,17 @@ install_subdir('catalog',
186186

187187
# autoconf generates the file there, ensure we get a conflict
188188
generated_sources_ac += {'src/include': ['stamp-h', 'stamp-ext-h']}
189+
190+
191+
generated_headers_stamp = custom_target('generated-headers-stamp.h',
192+
output: 'generated-headers-stamp.h',
193+
input: [generated_headers],
194+
command: stamp_cmd,
195+
)
196+
197+
generated_backend_headers_stamp = custom_target('generated-backend-headers-stamp.h',
198+
output: 'generated-backend-headers-stamp.h',
199+
input: [generated_backend_headers],
200+
depends: generated_headers_stamp,
201+
command: stamp_cmd,
202+
)

0 commit comments

Comments
 (0)