diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2021-03-11 22:21:05 -0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-03-14 16:33:03 +0000 |
| commit | 715a3860f728d08b0a9575690049553c7b8dd65a (patch) | |
| tree | 1fa030655211849cc2ca0be95c8ce2ffe8799085 /meta/recipes-support | |
| parent | 03dec80604ae363c31a5f2b68eb3efdba7c35f1a (diff) | |
| download | openembedded-core-715a3860f728d08b0a9575690049553c7b8dd65a.tar.gz | |
libunwind: Do not assume libdir for ppc64
This ensures that build respects OE's choice for libdir
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support')
| -rw-r--r-- | meta/recipes-support/libunwind/libunwind/0001-configure-Do-not-enforce-libdir-for-ppc64.patch | 35 | ||||
| -rw-r--r-- | meta/recipes-support/libunwind/libunwind_1.5.0.bb | 1 |
2 files changed, 36 insertions, 0 deletions
diff --git a/meta/recipes-support/libunwind/libunwind/0001-configure-Do-not-enforce-libdir-for-ppc64.patch b/meta/recipes-support/libunwind/libunwind/0001-configure-Do-not-enforce-libdir-for-ppc64.patch new file mode 100644 index 0000000000..751f1b3404 --- /dev/null +++ b/meta/recipes-support/libunwind/libunwind/0001-configure-Do-not-enforce-libdir-for-ppc64.patch @@ -0,0 +1,35 @@ +From 154c7465de2aeb9a8ba3416bbed6e6e07f58c583 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 11 Mar 2021 21:52:28 -0800 +Subject: [PATCH] configure: Do not enforce libdir for ppc64 + +OE has its own multilib configuration, therefore hardcoding libdir +breaks that, instead respect the settings coming from build environment +via configure options. + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + configure.ac | 6 ------ + 1 file changed, 6 deletions(-) + +diff --git a/configure.ac b/configure.ac +index c8d68f7..254440f 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -206,12 +206,6 @@ fi + AM_CONDITIONAL(USE_DWARF, [test x$use_dwarf = xyes]) + AC_MSG_RESULT([$use_dwarf]) + +-if test x$target_arch = xppc64; then +- libdir='${exec_prefix}/lib64' +- AC_MSG_NOTICE([PowerPC64 detected, lib will be installed ${libdir}]); +- AC_SUBST([libdir]) +-fi +- + AC_MSG_CHECKING([whether to restrict build to remote support]) + if test x$target_arch != x$host_arch; then + CPPFLAGS="${CPPFLAGS} -DUNW_REMOTE_ONLY" +-- +2.30.2 + diff --git a/meta/recipes-support/libunwind/libunwind_1.5.0.bb b/meta/recipes-support/libunwind/libunwind_1.5.0.bb index 5e4693e205..887a35708e 100644 --- a/meta/recipes-support/libunwind/libunwind_1.5.0.bb +++ b/meta/recipes-support/libunwind/libunwind_1.5.0.bb @@ -6,6 +6,7 @@ SRC_URI = "http://download.savannah.nongnu.org/releases/libunwind/libunwind-${PV file://0004-Fix-build-on-mips-musl.patch \ file://0005-ppc32-Consider-ucontext-mismatches-between-glibc-and.patch \ file://0006-Fix-for-X32.patch \ + file://0001-configure-Do-not-enforce-libdir-for-ppc64.patch \ " SRC_URI_append_libc-musl = " file://musl-header-conflict.patch" |