From 6017f3c6a4cb96c9edf91d1e7dc2823af417e493 Mon Sep 17 00:00:00 2001 From: Marcel Hollerbach Date: Wed, 27 May 2020 13:09:36 +0200 Subject: [PATCH] build: add correct flags to efl-one.pc they are required, and normally dragged in via eina. --- meson.build | 2 +- src/lib/eina/meson.build | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/meson.build b/meson.build index 96a6ed1..d6d230d 100644 --- a/meson.build +++ b/meson.build @@ -514,7 +514,7 @@ if (get_option('efl-one')) pkgconfig.generate( name : 'efl-one', description: 'Configureation for efl in one big fat .so', - libraries : efl_one, + libraries : [efl_one] + eina_pc_deps, #eina is a special case here which drags in m dl & threads ) #overwrite all the dependencies of subprojects with efl-one, in order to link the modules and binaries to the correct .so diff --git a/src/lib/eina/meson.build b/src/lib/eina/meson.build index 19a1d0b..d3d140d 100644 --- a/src/lib/eina/meson.build +++ b/src/lib/eina/meson.build @@ -1,7 +1,8 @@ eina_deps = [dl] eina_deps += tracing_deps eina_pub_deps = [thread_dep] -eina_ext_deps = [m, rt, dl, thread_dep] +eina_pc_deps = [m, rt, dl, thread_dep] #special case, this array is taken to drag in external deps to efl-one +eina_ext_deps = eina_pc_deps if sys_windows == true eina_pub_deps += [evil] @@ -401,5 +402,5 @@ pkgconfig.generate(eina_lib, name : 'eina', subdirs : ['eina-'+version_major, 'efl-'+version_major, join_paths('eina-'+version_major, 'eina')], version : version_major + '.' + version_minor + '.' + version_micro, - libraries : eina_pub_deps, + libraries : eina_pub_deps + eina_pc_deps, ) -- 2.7.4