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:13:46 +0000 |
| commit | 2f41ca3911dd5d227e2dc2801c89149cd4e37434 (patch) | |
| tree | 3aa24c60bcd376575021b40d9b33296bd4904ca0 /meta | |
| parent | 465a6b49b680e1fedb059e97eb682cf5814cf078 (diff) | |
| download | openembedded-core-2f41ca3911dd5d227e2dc2801c89149cd4e37434.tar.gz openembedded-core-2f41ca3911dd5d227e2dc2801c89149cd4e37434.tar.bz2 openembedded-core-2f41ca3911dd5d227e2dc2801c89149cd4e37434.zip | |
parted: fix rss+perf+gold failure on do_compile_ptest_base
Was detected in Martin's world build
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta')
| -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 @@ +From 5c99d7e4c2b5e7a957dc922aff03debfebbd6154 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> +Date: Fri, 3 Mar 2017 21:49:15 +0100 +Subject: [PATCH] libparted_fs_resize: link against libuuid explicitly to + unbreak gold linking on test +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +| ../libparted/fs/.libs/libparted-fs-resize.so: error: undefined reference to 'uuid_generate' + +Upstream-Status: Pending + +Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> +--- + libparted/fs/Makefile.am | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/libparted/fs/Makefile.am b/libparted/fs/Makefile.am +index d3cc8bc..c301b0b 100644 +--- a/libparted/fs/Makefile.am ++++ b/libparted/fs/Makefile.am +@@ -113,6 +113,8 @@ libparted_fs_resize_la_SOURCES = \ + r/hfs/reloc_plus.c \ + r/hfs/reloc_plus.h + ++libparted_fs_resize_la_LIBADD = $(UUID_LIBS) ++ + AM_CPPFLAGS = \ + -I$(top_srcdir)/libparted/labels \ + $(partedincludedir) \ +-- +2.9.3 + 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 \ file://fix-compile-failure-while-dis.patch \ file://0001-Include-fcntl.h-in-platform_defs.h.patch \ file://0001-Unset-need_charset_alias-when-building-for-musl.patch \ + file://0002-libparted_fs_resize-link-against-libuuid-explicitly-.patch \ file://parted-3.2-sysmacros.patch \ file://run-ptest \ file://Makefile \ |