diff options
| author | Zhixiong Chi <zhixiong.chi@windriver.com> | 2018-08-13 00:04:25 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-08-14 11:36:22 +0100 |
| commit | fbb2df435140eafc3fe1ca7419398e3b5ef273c8 (patch) | |
| tree | 792e0eb5504f4a790e7a794b4130510906a22ee9 | |
| parent | b13fa9bf966bb6f132e82b94bf1ecf4b2e095dbe (diff) | |
| download | openembedded-core-fbb2df435140eafc3fe1ca7419398e3b5ef273c8.tar.gz openembedded-core-fbb2df435140eafc3fe1ca7419398e3b5ef273c8.tar.bz2 openembedded-core-fbb2df435140eafc3fe1ca7419398e3b5ef273c8.zip | |
mobile-broadband-provider-info: fix .pc file conflict
Issue: LIN10-4485
Error: Transaction check error:
file /usr/share/pkgconfig/mobile-broadband-provider-info.pc from install of \
lib32-mobile-broadband-provider-info-dev.core2_32 conflicts with file from package \
mobile-broadband-provider-info-dev.core2_64
Signed-off-by: Zhixiong Chi <zhixiong.chi@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2 files changed, 20 insertions, 1 deletions
diff --git a/meta/recipes-connectivity/mobile-broadband-provider-info/mobile-broadband-provider-info/multilibfix.patch b/meta/recipes-connectivity/mobile-broadband-provider-info/mobile-broadband-provider-info/multilibfix.patch new file mode 100644 index 0000000000..9e75b7bdc5 --- /dev/null +++ b/meta/recipes-connectivity/mobile-broadband-provider-info/mobile-broadband-provider-info/multilibfix.patch @@ -0,0 +1,17 @@ +The mobile-broadband-provider-info.pc file is installed into a non-arch directory +yet contains libdir which can vary depending on which multilib is configured. +The .pc file does not require libdir so remove this to fix multilib builds. + +Upstream-Status: Pending +Signed-off-by: Zhixiong Chi <zhixiong.chi@windriver.com> +Index: git/mobile-broadband-provider-info.pc.in +=================================================================== +--- git.orig/mobile-broadband-provider-info.pc.in 2018-08-07 13:09:31.811364063 +0800 ++++ git/mobile-broadband-provider-info.pc.in 2018-08-10 17:49:25.645288320 +0800 +@@ -1,6 +1,5 @@ + prefix=@prefix@ + exec_prefix=@exec_prefix@ +-libdir=@libdir@ + datarootdir = @datarootdir@ + pkgdatadir=${datarootdir}/@PACKAGE@ + includedir=@includedir@ diff --git a/meta/recipes-connectivity/mobile-broadband-provider-info/mobile-broadband-provider-info_git.bb b/meta/recipes-connectivity/mobile-broadband-provider-info/mobile-broadband-provider-info_git.bb index dbc578e2d8..7b64b25e89 100644 --- a/meta/recipes-connectivity/mobile-broadband-provider-info/mobile-broadband-provider-info_git.bb +++ b/meta/recipes-connectivity/mobile-broadband-provider-info/mobile-broadband-provider-info_git.bb @@ -7,7 +7,9 @@ SRCREV = "befcbbc9867e742ac16415660b0b7521218a530c" PV = "20170310" PE = "1" -SRC_URI = "git://git.gnome.org/mobile-broadband-provider-info" +SRC_URI = "git://git.gnome.org/mobile-broadband-provider-info \ + file://multilibfix.patch \ +" S = "${WORKDIR}/git" inherit autotools |