meson: Add default cpp_eh=none cpp_rtti=false, ignore en@{bold,}quot

vaeth · Jul 10, 2022 · 40d3aea · 40d3aea
1 parent 3116cb6
commit 40d3aea
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -3,6 +3,8 @@
 *eix-0.36.4
  Martin Väth <martin at mvath.de>:
  - meson: All occurrences of run_command get a check argument
+ - meson: Add default cpp_eh=none cpp_rtti=false
+ - meson: Ignore en@quot and en@boldquot unless po files do exist
 
 *eix-0.36.3
  Martin Väth <martin at mvath.de>:

diff --git a/meson.build b/meson.build
@@ -4,6 +4,8 @@ project('eix', 'cpp',
  default_options : [
  'prefix=/usr',
  'sysconfdir=/etc',
+ 'cpp_eh=none',
+ 'cpp_rtti=false',
  ],
  meson_version : '>= 0.47',
  # 0.47: support run_command(check : true)

diff --git a/po/meson.build b/po/meson.build
@@ -3,6 +3,8 @@ test_linguas='''case " ${LINGUAS-*} " in
 *" $1 "*|*' * '*) exit 1;;
 esac
 '''
+test_have_po='''test -s "$1.po"
+'''
 check_langs = [
  ['de', true],
  ['en@quot', false],
@@ -11,11 +13,16 @@ check_langs = [
 ]
 foreach p : check_langs
  l = p.get(0)
- r = run_command(sh, '-c', test_linguas, 'sh', l)
+ r = run_command(sh, '-c', test_linguas, 'sh', l, check : false)
  if r.returncode() != 0
- langs += [ l ]
  if p.get(1)
+ langs += [ l ]
  manpages += [ l ]
+ else
+ s = run_command(sh, '-c', test_have_po, 'sh', l, check : false)
+ if s.returncode() == 0
+ langs += [ l ]
+ endif
  endif
  endif
 endforeach