From fbb2df435140eafc3fe1ca7419398e3b5ef273c8 Mon Sep 17 00:00:00 2001 From: Zhixiong Chi Date: Mon, 13 Aug 2018 00:04:25 -0700 Subject: 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 Signed-off-by: Richard Purdie --- .../mobile-broadband-provider-info/multilibfix.patch | 17 +++++++++++++++++ .../mobile-broadband-provider-info_git.bb | 4 +++- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-connectivity/mobile-broadband-provider-info/mobile-broadband-provider-info/multilibfix.patch (limited to 'meta') 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 +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 -- cgit 1.2.3-korg