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:31 +0100 |
commit | 4bd37c66f24e8d2b344307cde23050d7854a3094 (patch) | |
tree | de81c65df43fdc88ccf4eee8bb3cb28fd02a4026 /meta/recipes-connectivity/mobile-broadband-provider-info/mobile-broadband-provider-info/multilibfix.patch | |
parent | 70eb6be9b1c30d687c3f67a020680dcfab356f49 (diff) | |
download | poky-4bd37c66f24e8d2b344307cde23050d7854a3094.tar.gz |
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>
Diffstat (limited to 'meta/recipes-connectivity/mobile-broadband-provider-info/mobile-broadband-provider-info/multilibfix.patch')
-rw-r--r-- | meta/recipes-connectivity/mobile-broadband-provider-info/mobile-broadband-provider-info/multilibfix.patch | 17 |
1 files changed, 17 insertions, 0 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 @@ | |||
1 | The mobile-broadband-provider-info.pc file is installed into a non-arch directory | ||
2 | yet contains libdir which can vary depending on which multilib is configured. | ||
3 | The .pc file does not require libdir so remove this to fix multilib builds. | ||
4 | |||
5 | Upstream-Status: Pending | ||
6 | Signed-off-by: Zhixiong Chi <zhixiong.chi@windriver.com> | ||
7 | Index: git/mobile-broadband-provider-info.pc.in | ||
8 | =================================================================== | ||
9 | --- git.orig/mobile-broadband-provider-info.pc.in 2018-08-07 13:09:31.811364063 +0800 | ||
10 | +++ git/mobile-broadband-provider-info.pc.in 2018-08-10 17:49:25.645288320 +0800 | ||
11 | @@ -1,6 +1,5 @@ | ||
12 | prefix=@prefix@ | ||
13 | exec_prefix=@exec_prefix@ | ||
14 | -libdir=@libdir@ | ||
15 | datarootdir = @datarootdir@ | ||
16 | pkgdatadir=${datarootdir}/@PACKAGE@ | ||
17 | includedir=@includedir@ | ||