diff options
author | Andreas Müller <schnitzeltony@googlemail.com> | 2017-03-03 22:36:18 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-03-08 11:52:56 +0000 |
commit | fee8d9fdba8e2f20da9ab5cb7e42657683c06588 (patch) | |
tree | df6817522aa14302fa0b3836229a8075b50319f3 /meta/recipes-extended | |
parent | 2e213dd1b39615cf0f8ff92b6164c4f6c80b1844 (diff) | |
download | poky-fee8d9fdba8e2f20da9ab5cb7e42657683c06588.tar.gz |
parted: fix rss+perf+gold failure on do_compile_ptest_base
Was detected in Martin's world build
(From OE-Core rev: 2f41ca3911dd5d227e2dc2801c89149cd4e37434)
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r-- | meta/recipes-extended/parted/files/0002-libparted_fs_resize-link-against-libuuid-explicitly-.patch | 34 | ||||
-rw-r--r-- | meta/recipes-extended/parted/parted_3.2.bb | 1 |
2 files changed, 35 insertions, 0 deletions
diff --git a/meta/recipes-extended/parted/files/0002-libparted_fs_resize-link-against-libuuid-explicitly-.patch b/meta/recipes-extended/parted/files/0002-libparted_fs_resize-link-against-libuuid-explicitly-.patch new file mode 100644 index 0000000000..bd2b5c55b1 --- /dev/null +++ b/meta/recipes-extended/parted/files/0002-libparted_fs_resize-link-against-libuuid-explicitly-.patch | |||
@@ -0,0 +1,34 @@ | |||
1 | From 5c99d7e4c2b5e7a957dc922aff03debfebbd6154 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> | ||
3 | Date: Fri, 3 Mar 2017 21:49:15 +0100 | ||
4 | Subject: [PATCH] libparted_fs_resize: link against libuuid explicitly to | ||
5 | unbreak gold linking on test | ||
6 | MIME-Version: 1.0 | ||
7 | Content-Type: text/plain; charset=UTF-8 | ||
8 | Content-Transfer-Encoding: 8bit | ||
9 | |||
10 | | ../libparted/fs/.libs/libparted-fs-resize.so: error: undefined reference to 'uuid_generate' | ||
11 | |||
12 | Upstream-Status: Pending | ||
13 | |||
14 | Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> | ||
15 | --- | ||
16 | libparted/fs/Makefile.am | 2 ++ | ||
17 | 1 file changed, 2 insertions(+) | ||
18 | |||
19 | diff --git a/libparted/fs/Makefile.am b/libparted/fs/Makefile.am | ||
20 | index d3cc8bc..c301b0b 100644 | ||
21 | --- a/libparted/fs/Makefile.am | ||
22 | +++ b/libparted/fs/Makefile.am | ||
23 | @@ -113,6 +113,8 @@ libparted_fs_resize_la_SOURCES = \ | ||
24 | r/hfs/reloc_plus.c \ | ||
25 | r/hfs/reloc_plus.h | ||
26 | |||
27 | +libparted_fs_resize_la_LIBADD = $(UUID_LIBS) | ||
28 | + | ||
29 | AM_CPPFLAGS = \ | ||
30 | -I$(top_srcdir)/libparted/labels \ | ||
31 | $(partedincludedir) \ | ||
32 | -- | ||
33 | 2.9.3 | ||
34 | |||
diff --git a/meta/recipes-extended/parted/parted_3.2.bb b/meta/recipes-extended/parted/parted_3.2.bb index edc4bd3cc4..9ce2dfecd3 100644 --- a/meta/recipes-extended/parted/parted_3.2.bb +++ b/meta/recipes-extended/parted/parted_3.2.bb | |||
@@ -13,6 +13,7 @@ SRC_URI = "${GNU_MIRROR}/parted/parted-${PV}.tar.xz \ | |||
13 | file://fix-compile-failure-while-dis.patch \ | 13 | file://fix-compile-failure-while-dis.patch \ |
14 | file://0001-Include-fcntl.h-in-platform_defs.h.patch \ | 14 | file://0001-Include-fcntl.h-in-platform_defs.h.patch \ |
15 | file://0001-Unset-need_charset_alias-when-building-for-musl.patch \ | 15 | file://0001-Unset-need_charset_alias-when-building-for-musl.patch \ |
16 | file://0002-libparted_fs_resize-link-against-libuuid-explicitly-.patch \ | ||
16 | file://parted-3.2-sysmacros.patch \ | 17 | file://parted-3.2-sysmacros.patch \ |
17 | file://run-ptest \ | 18 | file://run-ptest \ |
18 | file://Makefile \ | 19 | file://Makefile \ |