Add bitcode generation support on meson for contrib modules

Added a new variable in root meson.build for tracking the list of source
files in contrib for further bitcode generation: `llvm_contrib_sources`.

This list is used for non generated sources, which share common
compilation flags for contrib modules.

For contrib modules that require specific compilation flags, a separate
variable was added on root meson.build: `bc_gen_custom_contrib`.

It must be noted that there is no standard way of reusing meson
dependency (`dep`) objects for custom target / generator as a mean of
getting proper compilation flags, those must be included manually.

As an example, for generating bitcode for contrib/hstore_plpython, we
can't reuse the `python3_dep` object in the generator, so one way to get
proper include directory was querying the `python3_inst` object like
this: pyinc = python3_inst.get_variable('INCLUDEPY'), which extracts the
variable name using python sysinfo.

Author: darkfronza

contrib/amcheck/meson.build

@@ -15,7 +15,11 @@ amcheck = shared_module('amcheck',
   amcheck_sources,
   kwargs: contrib_mod_args,
 )
-contrib_targets += amcheck
+
+if llvm.found()
+  contrib_targets += amcheck
+  llvm_contrib_sources += amcheck_sources
+endif
 
 install_data(
   'amcheck.control',

contrib/auth_delay/meson.build

@@ -14,4 +14,8 @@ auth_delay = shared_module('auth_delay',
   auth_delay_sources,
   kwargs: contrib_mod_args,
 )
-contrib_targets += auth_delay
+
+if llvm.found()
+  contrib_targets += auth_delay
+  llvm_contrib_sources += auth_delay_sources
+endif

contrib/auto_explain/meson.build

@@ -14,7 +14,11 @@ auto_explain = shared_module('auto_explain',
   auto_explain_sources,
   kwargs: contrib_mod_args,
 )
-contrib_targets += auto_explain
+
+if llvm.found()
+  contrib_targets += auto_explain
+  llvm_contrib_sources += auto_explain_sources
+endif
 
 tests += {
   'name': 'auto_explain',

contrib/basebackup_to_shell/meson.build

@@ -14,7 +14,11 @@ basebackup_to_shell = shared_module('basebackup_to_shell',
   basebackup_to_shell_sources,
   kwargs: contrib_mod_args,
 )
-contrib_targets += basebackup_to_shell
+
+if llvm.found()
+  contrib_targets += basebackup_to_shell
+  llvm_contrib_sources += basebackup_to_shell_sources
+endif
 
 tests += {
   'name': 'basebackup_to_shell',

contrib/basic_archive/meson.build

@@ -14,7 +14,11 @@ basic_archive = shared_module('basic_archive',
   basic_archive_sources,
   kwargs: contrib_mod_args,
 )
-contrib_targets += basic_archive
+
+if llvm.found()
+  contrib_targets += basic_archive
+  llvm_contrib_sources += basic_archive_sources
+endif
 
 tests += {
   'name': 'basic_archive',

contrib/bloom/meson.build

@@ -20,7 +20,12 @@ bloom = shared_module('bloom',
   c_pch: pch_postgres_h,
   kwargs: contrib_mod_args,
 )
-contrib_targets += bloom
+
+if llvm.found()
+  contrib_targets += bloom
+  llvm_contrib_sources += bloom_sources
+endif
+
 
 install_data(
   'bloom.control',

contrib/bool_plperl/meson.build

@@ -14,7 +14,7 @@ if host_system == 'windows'
     '--FILEDESC', 'bool_plperl - bool transform for plperl',])
 endif
 
-bool_plperl = shared_module('bool_plperl',
+bool_plperl= shared_module('bool_plperl',
   bool_plperl_sources,
   include_directories: [plperl_inc, include_directories('.')],
   kwargs: contrib_mod_args + {
@@ -23,7 +23,24 @@ bool_plperl = shared_module('bool_plperl',
     'build_rpath': '@0@/CORE'.format(archlibexp),
   },
 )
-contrib_targets += bool_plperl
+
+if llvm.found()
+  llvm_contrib_bool_plperl_cflags = [
+    '-I@BUILD_ROOT@/contrib/bool_plperl',
+    '-I@SOURCE_ROOT@/contrib/bool_plperl',
+    '-I@BUILD_ROOT@/src/pl/plperl',
+    '-I@SOURCE_ROOT@/src/pl/plperl',
+  ]
+
+  llvm_gen_contrib_bool_plperl = generator(llvm_irgen_command,
+    arguments: llvm_irgen_args + bitcode_cflags + pg_mod_c_args + llvm_contrib_bool_plperl_cflags + perl_ccflags,
+    depends: bool_plperl,
+    depfile: '@[email protected]',
+    output: '@[email protected]',
+  )
+
+  bc_gen_custom_contrib += llvm_gen_contrib_bool_plperl.process(bool_plperl_sources)
+endif
 
 install_data(
   'bool_plperl.control',

contrib/btree_gin/meson.build

@@ -14,7 +14,11 @@ btree_gin = shared_module('btree_gin',
   btree_gin_sources,
   kwargs: contrib_mod_args,
 )
-contrib_targets += btree_gin
+
+if llvm.found()
+  contrib_targets += btree_gin
+  llvm_contrib_sources += btree_gin_sources
+endif
 
 install_data(
   'btree_gin.control',

contrib/btree_gist/meson.build

@@ -38,7 +38,11 @@ btree_gist = shared_module('btree_gist',
   c_pch: pch_postgres_h,
   kwargs: contrib_mod_args,
 )
-contrib_targets += btree_gist
+
+if llvm.found()
+  contrib_targets += btree_gist
+  llvm_contrib_sources += btree_gist_sources
+endif
 
 install_data(
   'btree_gist.control',

contrib/citext/meson.build

@@ -14,7 +14,11 @@ citext = shared_module('citext',
   citext_sources,
   kwargs: contrib_mod_args,
 )
-contrib_targets += citext
+
+if llvm.found()
+  contrib_targets += citext
+  llvm_contrib_sources += citext_sources
+endif
 
 install_data(
   'citext.control',

contrib/cube/meson.build

@@ -11,13 +11,15 @@ cube_scan = custom_target('cubescan',
 )
 generated_sources += cube_scan
 cube_sources += cube_scan
+bc_cube_sources = cube_sources
 
 cube_parse = custom_target('cubeparse',
   input: 'cubeparse.y',
   kwargs: bison_kw,
 )
 generated_sources += cube_parse.to_list()
 cube_sources += cube_parse
+bc_cube_sources += cube_parse[0]
 
 if host_system == 'windows'
   cube_sources += rc_lib_gen.process(win32ver_rc, extra_args: [
@@ -30,7 +32,22 @@ cube = shared_module('cube',
   include_directories: include_directories('.'),
   kwargs: contrib_mod_args,
 )
-contrib_targets += cube
+
+if llvm.found()
+  llvm_contrib_cube_cflags = [
+    '-I@BUILD_ROOT@/contrib/cube',
+    '-I@SOURCE_ROOT@/contrib/cube',
+  ]
+
+  llvm_gen_contrib_cube = generator(llvm_irgen_command,
+    arguments: llvm_irgen_args + bitcode_cflags + pg_mod_c_args + llvm_contrib_cube_cflags,
+    depends: cube,
+    depfile: '@[email protected]',
+    output: '@[email protected]',
+  )
+
+  bc_gen_custom_contrib += llvm_gen_contrib_cube.process(bc_cube_sources)
+endif
 
 install_data(
   'cube.control',

contrib/dblink/meson.build

@@ -18,6 +18,10 @@ dblink = shared_module('dblink',
 )
 contrib_targets += dblink
 
+# if llvm.found()
+#   llvm_contrib_sources += dblink_sources
+# endif
+
 install_data(
   'dblink.control',
   'dblink--1.0--1.1.sql',

contrib/dict_int/meson.build

@@ -14,7 +14,11 @@ dict_int = shared_module('dict_int',
   dict_int_sources,
   kwargs: contrib_mod_args,
 )
-contrib_targets += dict_int
+
+if llvm.found()
+  contrib_targets += dict_int
+  llvm_contrib_sources += dict_int_sources
+endif
 
 install_data(
   'dict_int.control',

contrib/dict_xsyn/meson.build

@@ -14,7 +14,11 @@ dict_xsyn = shared_module('dict_xsyn',
   dict_xsyn_sources,
   kwargs: contrib_mod_args,
 )
-contrib_targets += dict_xsyn
+
+if llvm.found()
+  contrib_targets += dict_xsyn
+  llvm_contrib_sources += dict_xsyn_sources
+endif
 
 install_data(
   'dict_xsyn.control',

contrib/earthdistance/meson.build

@@ -14,7 +14,11 @@ earthdistance = shared_module('earthdistance',
   earthdistance_sources,
   kwargs: contrib_mod_args,
 )
-contrib_targets += earthdistance
+
+if llvm.found()
+  contrib_targets += earthdistance
+  llvm_contrib_sources += earthdistance_sources
+endif
 
 install_data(
   'earthdistance.control',

contrib/file_fdw/meson.build

@@ -14,7 +14,11 @@ file_fdw = shared_module('file_fdw',
   file_fdw_sources,
   kwargs: contrib_mod_args,
 )
-contrib_targets += file_fdw
+
+if llvm.found()
+  contrib_targets += file_fdw
+  llvm_contrib_sources += file_fdw_sources
+endif
 
 install_data(
   'file_fdw.control',

contrib/fuzzystrmatch/meson.build

@@ -6,6 +6,8 @@ fuzzystrmatch_sources = files(
   'fuzzystrmatch.c',
 )
 
+bc_fuzzystrmatch_sources = fuzzystrmatch_sources
+
 daitch_mokotoff_h = custom_target('daitch_mokotoff',
   input: 'daitch_mokotoff_header.pl',
   output: 'daitch_mokotoff.h',
@@ -27,6 +29,21 @@ fuzzystrmatch = shared_module('fuzzystrmatch',
 )
 contrib_targets += fuzzystrmatch
 
+if llvm.found()
+  llvm_contrib_fuzzystrmatch_cflags = [
+    '-I@BUILD_ROOT@/contrib/fuzzystrmatch',
+    '-I@SOURCE_ROOT@/contrib/fuzzystrmatch',
+  ]
+
+  llvm_gen_contrib_fuzzystrmatch = generator(llvm_irgen_command,
+    arguments: llvm_irgen_args + bitcode_cflags + pg_mod_c_args + llvm_contrib_fuzzystrmatch_cflags,
+    depends: daitch_mokotoff_h,
+    depfile: '@[email protected]',
+    output: '@[email protected]',
+  )
+
+  bc_gen_custom_contrib += llvm_gen_contrib_fuzzystrmatch.process(bc_fuzzystrmatch_sources)
+endif
 install_data(
   'fuzzystrmatch.control',
   'fuzzystrmatch--1.0--1.1.sql',

contrib/hstore/meson.build

@@ -23,7 +23,11 @@ hstore = shared_module('hstore',
   c_pch: pch_postgres_h,
   kwargs: contrib_mod_args,
 )
-contrib_targets += hstore
+
+if llvm.found()
+  contrib_targets += hstore
+  llvm_contrib_sources += hstore_sources
+endif
 
 install_data(
   'hstore.control',

contrib/hstore_plperl/meson.build

@@ -23,7 +23,24 @@ hstore_plperl = shared_module('hstore_plperl',
     'build_rpath': '@0@/CORE'.format(archlibexp),
   },
 )
-contrib_targets += hstore_plperl
+
+if llvm.found()
+  llvm_contrib_hstore_plperl_cflags = [
+    '-I@BUILD_ROOT@/src/pl/plperl',
+    '-I@SOURCE_ROOT@/src/pl/plperl',
+    '-I@SOURCE_ROOT@/contrib',
+    '-I@SOURCE_ROOT@/contrib/hstore',
+  ]
+
+  llvm_gen_contrib_hstore_plperl = generator(llvm_irgen_command,
+    arguments: llvm_irgen_args + bitcode_cflags + pg_mod_c_args + llvm_contrib_hstore_plperl_cflags + perl_ccflags,
+    depends: hstore_plperl,
+    depfile: '@[email protected]',
+    output: '@[email protected]',
+  )
+
+  bc_gen_custom_contrib += llvm_gen_contrib_hstore_plperl.process(hstore_plperl_sources)
+endif
 
 install_data(
   'hstore_plperl.control',

contrib/hstore_plpython/meson.build

@@ -22,7 +22,27 @@ hstore_plpython = shared_module('hstore_plpython3',
     'dependencies': [python3_dep, contrib_mod_args['dependencies']],
   },
 )
-contrib_targets += hstore_plpython
+
+if llvm.found()
+  pyinc = python3_inst.get_variable('INCLUDEPY')
+  llvm_contrib_hstore_plpython_cflags = [
+    '-I@SOURCE_ROOT@/src/pl/plpython',
+    '-I@SOURCE_ROOT@/contrib',
+    '-I@SOURCE_ROOT@/contrib/hstore',
+    '-DPLPYTHON_LIBNAME="plpython3"',
+    '-I@0@'.format(pyinc),
+  ]
+
+  llvm_gen_contrib_hstore_plpython = generator(llvm_irgen_command,
+    arguments: llvm_irgen_args + bitcode_cflags + pg_mod_c_args + llvm_contrib_hstore_plpython_cflags,
+    depends: hstore_plpython,
+    depfile: '@[email protected]',
+    output: '@[email protected]',
+  )
+
+  bc_gen_custom_contrib += llvm_gen_contrib_hstore_plpython.process(hstore_plpython_sources)
+endif
+
 
 install_data(
   'hstore_plpython3u--1.0.sql',

contrib/intarray/meson.build

@@ -20,7 +20,11 @@ intarray = shared_module('_int',
   intarray_sources,
   kwargs: contrib_mod_args,
 )
-contrib_targets += intarray
+
+if llvm.found()
+  contrib_targets += intarray
+  llvm_contrib_sources += intarray_sources
+endif
 
 install_data(
   'intarray.control',

contrib/isn/meson.build

@@ -14,7 +14,11 @@ isn = shared_module('isn',
   isn_sources,
   kwargs: contrib_mod_args,
 )
-contrib_targets += isn
+
+if llvm.found()
+  contrib_targets += isn
+  llvm_contrib_sources += isn_sources
+endif
 
 install_data(
   'isn.control',