Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 1 | From e7e0c56ca82031121f192f7f711b78418b154c9f Mon Sep 17 00:00:00 2001 |
| 2 | From: Jackie Huang <jackie.huang@windriver.com> |
| 3 | Date: Mon, 28 Nov 2016 10:17:34 +0800 |
| 4 | Subject: [PATCH] gcr: add missing dependencies for vapi |
| 5 | |
| 6 | According to the vapi_DEPS definition: |
| 7 | gcr-3.vapi depends on gck-1.vapi, |
| 8 | gcr-ui-3.vapi depends on gck-1.vapi and gcr-3.vapi |
| 9 | |
| 10 | But these dependencies are missing for the make targets, |
| 11 | so it will fail when build in parallel: |
| 12 | error: Package `gck-1' not found in specified Vala API directories or GObject-Introspection GIR directories |
| 13 | error: Package `gcr-3' not found in specified Vala API directories or GObject-Introspection GIR directories |
| 14 | |
| 15 | Upstream-Status: Submitted [https://bug775966.bugzilla-attachments.gnome.org/attachment.cgi?id=341791] |
| 16 | |
| 17 | Signed-off-by: Jackie Huang <jackie.huang@windriver.com> |
| 18 | --- |
| 19 | gcr/Makefile.am | 2 +- |
| 20 | ui/Makefile.am | 2 +- |
| 21 | 2 files changed, 2 insertions(+), 2 deletions(-) |
| 22 | |
| 23 | diff --git a/gcr/Makefile.am b/gcr/Makefile.am |
| 24 | index eda302f..6e78dba 100644 |
| 25 | --- a/gcr/Makefile.am |
| 26 | +++ b/gcr/Makefile.am |
| 27 | @@ -221,7 +221,7 @@ gir_DATA += Gcr-@GCR_MAJOR@.gir |
| 28 | |
| 29 | if ENABLE_VAPIGEN |
| 30 | |
| 31 | -gcr-@GCR_MAJOR@.vapi: Gcr-@GCR_MAJOR@.gir gcr/Gcr-@GCR_MAJOR@.metadata gcr-@GCR_MAJOR@.deps |
| 32 | +gcr-@GCR_MAJOR@.vapi: Gcr-@GCR_MAJOR@.gir gcr/Gcr-@GCR_MAJOR@.metadata gcr-@GCR_MAJOR@.deps gck-@GCK_MAJOR@.vapi |
| 33 | |
| 34 | VAPIGEN_VAPIS += gcr-@GCR_MAJOR@.vapi |
| 35 | |
| 36 | diff --git a/ui/Makefile.am b/ui/Makefile.am |
| 37 | index aa52476..6612f0d 100644 |
| 38 | --- a/ui/Makefile.am |
| 39 | +++ b/ui/Makefile.am |
| 40 | @@ -160,7 +160,7 @@ gir_DATA += GcrUi-@GCR_MAJOR@.gir |
| 41 | |
| 42 | if ENABLE_VAPIGEN |
| 43 | |
| 44 | -gcr-ui-@GCR_MAJOR@.vapi: GcrUi-@GCR_MAJOR@.gir ui/GcrUi-@GCR_MAJOR@.metadata gcr-ui-@GCR_MAJOR@.deps |
| 45 | +gcr-ui-@GCR_MAJOR@.vapi: GcrUi-@GCR_MAJOR@.gir ui/GcrUi-@GCR_MAJOR@.metadata gcr-ui-@GCR_MAJOR@.deps gck-@GCK_MAJOR@.vapi gcr-@GCR_MAJOR@.vapi |
| 46 | |
| 47 | VAPIGEN_VAPIS += gcr-ui-@GCR_MAJOR@.vapi |
| 48 | |
| 49 | -- |
| 50 | 2.8.3 |
| 51 | |