mirror of
https://git.yoctoproject.org/poky
synced 2026-03-06 15:29:40 +01:00
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 (From OE-Core rev: fbb2df435140eafc3fe1ca7419398e3b5ef273c8) Signed-off-by: Zhixiong Chi <zhixiong.chi@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
70eb6be9b1
commit
4bd37c66f2
@@ -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@
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user