fix: remove env-var kluge; try to switch to mariadb

meson.build

@@ -28,12 +28,7 @@ pkg = import('pkgconfig')
 fs = import('fs')
 
 # build subprojects
-rcdb_subproj = subproject(
-  'rcdb',
-  default_options: {
-    'home': run_command('meson' / 'get-env.py', 'RCDB_HOME', check: false).stdout().strip(),
-  }
-)
+rcdb_subproj = subproject('rcdb')
 
 # resolve dependencies
 prog_minver = find_program('meson' / 'minimum-version.sh')
@@ -194,6 +189,8 @@ project_test_env.set(
 # set preprocessor macros
 add_project_arguments(
   '-DIGUANA_ETCDIR="' + get_option('prefix') / project_etc + '"',
+  '-DDRCDB_MYSQL=1', # FIXME: not really the best place for this...
+  '-DDRCDB_SQLITE=0', # FIXME: not really the best place for this...
   language: [ 'cpp' ],
 )
 

meson/release/install-cvmfs.sh

@@ -70,6 +70,7 @@ msg "meson setup"
 meson setup $buildDir $sourceDir \
   --native-file=$nativeFile      \
   --prefix=$installDir           \
+  -Drcdb:home=$RCDB_HOME         \
   -Dtest_data_file=$testFile
 msg "meson install"
 meson install -C $buildDir

src/iguana/algorithms/meson.build

@@ -140,8 +140,6 @@ foreach algo : algo_dict
         ],
       )
       algo_bind_c_sources += tgt[0]
-    else
-      warning('Algorithm "' + algo_name + '" has no bindings')
     endif
 
   else
@@ -160,8 +158,6 @@ foreach algo : algo_dict
         vdor_headers += algo_dir / src_file
       endforeach
     endif
-  else
-    warning('Algorithm "' + algo_name + '" has no validator')
   endif
 
 endforeach

subprojects/rcdb/meson.build

@@ -17,10 +17,11 @@ if get_option('home') != ''
     warning(f'RCDB include directory "@includedir@" does not exist; RCDB will not be used')
   endif
 else
-  warning('RCDB not found; either use build option "rcdb:home" or set environment variable "$RCDB_HOME"')
+  warning('RCDB not found; set build option "rcdb:home" to the RCDB installation (e.g., "$RCDB_HOME") if you want to use it, but it is not strictly required.')
 endif
 
-sqlite_dep = dependency('sqlite3', required: use_rcdb)
+mariadb_dep = dependency('mariadb', required: use_rcdb)
+# sqlite_dep = dependency('sqlite3', required: use_rcdb)
 #
 #
 ### clas12root consumes rcdb using mysql, NOT sqlite
@@ -41,5 +42,5 @@ rcdb_dep = not use_rcdb ? dependency('', required: false) : declare_dependency(
     includedir,
     is_system: true, # suppress consumer warnings
   ),
-  dependencies: [ sqlite_dep ],
+  dependencies: [ mariadb_dep ],
 )

subprojects/rcdb/meson.options

@@ -1 +1 @@
-option('home', type: 'string', value: '', description: 'Location of RCDB installation; if empty, use `$RCDB_HOME`')
+option('home', type: 'string', value: '', description: 'Location of RCDB installation; if empty, RCDB will not be included')