diff options
| author | Marcel Hollerbach <mail@marcel-hollerbach.de> | 2020-05-27 13:09:36 +0200 |
|---|---|---|
| committer | Marcel Hollerbach <mail@marcel-hollerbach.de> | 2020-05-27 13:26:15 +0200 |
| commit | 0b08318117540f45e87874f000d2aa5eb90bcbee (patch) | |
| tree | c91cf4996c2ea6d1effe33f1e1ac7e78bedd0d9b | |
| parent | b1c65d4da790e0a3c6b3bbaf027fa8f8e771e40b (diff) | |
| download | efl-0b08318117540f45e87874f000d2aa5eb90bcbee.tar.gz | |
build: add correct flags to efl-one.pc
they are required, and normally dragged in via eina.
| -rw-r--r-- | meson.build | 2 | ||||
| -rw-r--r-- | src/lib/eina/meson.build | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/meson.build b/meson.build index 1533d984f7..5f6c339907 100644 --- a/meson.build +++ b/meson.build @@ -504,7 +504,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 8df3660f31..bdb69000b9 100644 --- a/src/lib/eina/meson.build +++ b/src/lib/eina/meson.build @@ -1,6 +1,7 @@ eina_deps = [dl] 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] @@ -393,5 +394,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, ) |