summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2019-05-21 14:44:35 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-05-22 07:24:51 +0100
commita4ed1923381cb0af9fc2e9d67eb887652cdb06b6 (patch)
tree67d523658d3b1d4b57b9dde9bd52305ed5642a9f /meta/recipes-connectivity
parentbcf0c5b7a218e35eb5fc92364b42b4b8144bcdc7 (diff)
downloadpoky-a4ed1923381cb0af9fc2e9d67eb887652cdb06b6.tar.gz
ofono: Fix another race condition during the build
(From OE-Core rev: 1e4b8c0f60edad14a422dc22b42bd6618695ce85) Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity')
-rw-r--r--meta/recipes-connectivity/ofono/ofono/0001-Makefile.am-Don-t-overwrite-src_ofonod_DEPENDENCIES.patch50
-rw-r--r--meta/recipes-connectivity/ofono/ofono_1.29.bb1
2 files changed, 51 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/ofono/ofono/0001-Makefile.am-Don-t-overwrite-src_ofonod_DEPENDENCIES.patch b/meta/recipes-connectivity/ofono/ofono/0001-Makefile.am-Don-t-overwrite-src_ofonod_DEPENDENCIES.patch
new file mode 100644
index 0000000000..77073ddb1c
--- /dev/null
+++ b/meta/recipes-connectivity/ofono/ofono/0001-Makefile.am-Don-t-overwrite-src_ofonod_DEPENDENCIES.patch
@@ -0,0 +1,50 @@
1From eeaf8dac80f15a2b7c18d1d4ee63106973a6a873 Mon Sep 17 00:00:00 2001
2From: Adrian Bunk <bunk@kernel.org>
3Date: Tue, 21 May 2019 14:13:35 +0300
4Subject: Makefile.am: Don't overwrite src_ofonod_DEPENDENCIES
5
6src_ofonod_DEPENDENCIES did overwrite the dependencies
7automatically generated from src_ofonod_LDADD with
8incomplete dependencies.
9
10This fixes the following build error:
11...
12 CCLD src/ofonod
13libtool: error: cannot find the library 'gdbus/libgdbus-internal.la' or unhandled argument 'gdbus/libgdbus-internal.la'
14make: *** [Makefile:3448: src/ofonod] Error 1
15
16Upstream-Status: Submitted
17Signed-off-by: Adrian Bunk <bunk@stusta.de>
18---
19 Makefile.am | 4 ----
20 1 file changed, 4 deletions(-)
21
22diff --git a/Makefile.am b/Makefile.am
23index d2e310d5..5edc4488 100644
24--- a/Makefile.am
25+++ b/Makefile.am
26@@ -6,12 +6,10 @@ noinst_LTLIBRARIES =
27 if EXTERNAL_ELL
28 ell_cflags = @ELL_CFLAGS@
29 ell_ldadd = @ELL_LIBS@
30-ell_dependencies =
31 ell_built_sources =
32 else
33 ell_cflags =
34 ell_ldadd = ell/libell-internal.la
35-ell_dependencies = $(ell_ldadd)
36 ell_built_sources = ell/internal ell/ell.h
37
38 noinst_LTLIBRARIES += ell/libell-internal.la
39@@ -729,8 +727,6 @@ src_ofonod_LDADD = gdbus/libgdbus-internal.la $(builtin_libadd) $(ell_ldadd) \
40 src_ofonod_LDFLAGS = -Wl,--export-dynamic \
41 -Wl,--version-script=$(srcdir)/src/ofono.ver
42
43-src_ofonod_DEPENDENCIES = $(ell_dependencies)
44-
45 BUILT_SOURCES = $(local_headers) $(ell_built_sources) src/builtin.h
46
47 CLEANFILES = $(BUILT_SOURCES) $(rules_DATA)
48--
492.20.1
50
diff --git a/meta/recipes-connectivity/ofono/ofono_1.29.bb b/meta/recipes-connectivity/ofono/ofono_1.29.bb
index a5fa81de2f..b5838e19bf 100644
--- a/meta/recipes-connectivity/ofono/ofono_1.29.bb
+++ b/meta/recipes-connectivity/ofono/ofono_1.29.bb
@@ -6,6 +6,7 @@ SRC_URI = "\
6 file://0001-build-Fix-a-race-condition.patch \ 6 file://0001-build-Fix-a-race-condition.patch \
7 file://0001-build-Add-check-for-explicit_bzero-support.patch \ 7 file://0001-build-Add-check-for-explicit_bzero-support.patch \
8 file://0001-main-Quiet-ld-errors-with-external-ell.patch \ 8 file://0001-main-Quiet-ld-errors-with-external-ell.patch \
9 file://0001-Makefile.am-Don-t-overwrite-src_ofonod_DEPENDENCIES.patch \
9" 10"
10SRC_URI[md5sum] = "4fa0372630ff03f223452e4d05efa8f8" 11SRC_URI[md5sum] = "4fa0372630ff03f223452e4d05efa8f8"
11SRC_URI[sha256sum] = "67f0f8e5740dea5b46309e40667d1e560be39c90ef08dd01ff9e9ce8e61f0679" 12SRC_URI[sha256sum] = "67f0f8e5740dea5b46309e40667d1e560be39c90ef08dd01ff9e9ce8e61f0679"