summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Hollerbach <mail@marcel-hollerbach.de>2020-05-27 13:09:36 +0200
committerMarcel Hollerbach <mail@marcel-hollerbach.de>2020-05-27 13:26:15 +0200
commit0b08318117540f45e87874f000d2aa5eb90bcbee (patch)
treec91cf4996c2ea6d1effe33f1e1ac7e78bedd0d9b
parentb1c65d4da790e0a3c6b3bbaf027fa8f8e771e40b (diff)
build: add correct flags to efl-one.pc
they are required, and normally dragged in via eina.
-rw-r--r--meson.build2
-rw-r--r--src/lib/eina/meson.build5
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'))
504 pkgconfig.generate( 504 pkgconfig.generate(
505 name : 'efl-one', 505 name : 'efl-one',
506 description: 'Configureation for efl in one big fat .so', 506 description: 'Configureation for efl in one big fat .so',
507 libraries : efl_one, 507 libraries : [efl_one] + eina_pc_deps, #eina is a special case here which drags in m dl & threads
508 ) 508 )
509 509
510 #overwrite all the dependencies of subprojects with efl-one, in order to link the modules and binaries to the correct .so 510 #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 @@
1eina_deps = [dl] 1eina_deps = [dl]
2eina_pub_deps = [thread_dep] 2eina_pub_deps = [thread_dep]
3eina_ext_deps = [m, rt, dl, thread_dep] 3eina_pc_deps = [m, rt, dl, thread_dep] #special case, this array is taken to drag in external deps to efl-one
4eina_ext_deps = eina_pc_deps
4 5
5if sys_windows == true 6if sys_windows == true
6 eina_pub_deps += [evil] 7 eina_pub_deps += [evil]
@@ -393,5 +394,5 @@ pkgconfig.generate(eina_lib,
393 name : 'eina', 394 name : 'eina',
394 subdirs : ['eina-'+version_major, 'efl-'+version_major, join_paths('eina-'+version_major, 'eina')], 395 subdirs : ['eina-'+version_major, 'efl-'+version_major, join_paths('eina-'+version_major, 'eina')],
395 version : version_major + '.' + version_minor + '.' + version_micro, 396 version : version_major + '.' + version_minor + '.' + version_micro,
396 libraries : eina_pub_deps, 397 libraries : eina_pub_deps + eina_pc_deps,
397) 398)