From 1804b28a0d38496c9ca7e853d719973303b93d3a Mon Sep 17 00:00:00 2001 From: David Boddie Date: Mon, 1 Jul 2019 16:37:27 +0200 Subject: [PATCH] Link rslib statically --- debian/triggers | 1 - src/meson.build | 9 ++++----- 2 files changed, 4 insertions(+), 6 deletions(-) delete mode 100644 debian/triggers diff --git a/debian/triggers b/debian/triggers deleted file mode 100644 index dd866036..00000000 --- a/debian/triggers +++ /dev/null @@ -1 +0,0 @@ -activate-noawait ldconfig diff --git a/src/meson.build b/src/meson.build index 074b0dc2..1266bb8b 100644 --- a/src/meson.build +++ b/src/meson.build @@ -46,7 +46,6 @@ sources = [ cc = meson.get_compiler('c') - deps = [ # dependency('glib-2.0', version: '>=2.26.0'), dependency('gio-2.0', version: '>=2.26.0'), @@ -56,19 +55,19 @@ deps = [ dependency('xkbcommon'), cc.find_library('m'), cc.find_library('rt'), + cc.find_library('libstd-79f126b09196cdf2'), # dependency('libxklavier'), # FIXME remove ] # Replacement for eekboard-server -rslib = library( +rslib = static_library( 'rslib', - sources:['imservice.rs'], - install: true + sources: ['imservice.rs'] ) squeekboard = executable('squeekboard', sources, - link_with: rslib, + link_with: [rslib], include_directories: [include_directories('..'), include_directories('../eek')], dependencies: deps, install: true,