From: "Martin Jansa" <Martin.Jansa@gmail.com>
To: openembedded-devel@lists.openembedded.org
Cc: Martin Jansa <Martin.Jansa@gmail.com>
Subject: [meta-oe][PATCH] ace: fix installation paths when usrmerge is used
Date: Sun, 14 Jun 2020 14:37:34 +0200 [thread overview]
Message-ID: <20200614123734.2396875-1-Martin.Jansa@gmail.com> (raw)
* INSTALL_LIB is used after INSTALL_PREFIX and in usrmerge case the /usr prefix is duplicated twice, because
export exec_prefix="/usr"
export base_libdir="/usr/lib"
use baselib which is without the exec_prefix/base_prefix from root_prefis:
# "${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', '${exec_prefix}', '${base_prefix}', d)}"
root_prefix="/usr"
baselib="lib"
* fixes:
ERROR: ace-6.5.8-r0 do_package: QA Issue: ace: Files/directories were installed but not shipped in any package:
/usr/usr/lib/libACE.so
/usr/usr/lib/libACE_Compression.so.6.5.8
/usr/usr/lib/libACE_ETCL_Parser.so.6.5.8
/usr/usr/lib/libACE.so.6.5.8
/usr/usr/lib/libACE_RLECompression.so.6.5.8
/usr/usr/lib/libACE_Compression.so
/usr/usr/lib/libACE_ETCL_Parser.so
/usr/usr/lib/libACE_Monitor_Control.so.6.5.8
/usr/usr/lib/libACE_ETCL.so
/usr/usr/lib/libACE_RLECompression.so
/usr/usr/lib/libACE_Monitor_Control.so
/usr/usr/lib/libACE_ETCL.so.6.5.8
/usr/usr/lib/pkgconfig
/usr/usr/lib/pkgconfig/ACE.pc
/usr/usr/lib/pkgconfig/ACE_ETCL_Parser.pc
/usr/usr/lib/pkgconfig/ACE_ETCL.pc
Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or delete them within do_install.
ace: 16 installed and not shipped files. [installed-vs-shipped]
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta-oe/recipes-connectivity/ace/ace_6.5.8.bb | 2 ++
meta-oe/recipes-connectivity/ace/files/ace_config.patch | 3 +--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/meta-oe/recipes-connectivity/ace/ace_6.5.8.bb b/meta-oe/recipes-connectivity/ace/ace_6.5.8.bb
index 24315320e4..e35bce7f3c 100644
--- a/meta-oe/recipes-connectivity/ace/ace_6.5.8.bb
+++ b/meta-oe/recipes-connectivity/ace/ace_6.5.8.bb
@@ -24,6 +24,8 @@ inherit pkgconfig
CXXFLAGS_append = " -fpermissive -Wnodeprecated-declarations"
+EXTRA_OEMAKE += "INSTALL_LIB=${baselib}"
+
do_install() {
export D="${D}"
oe_runmake install
diff --git a/meta-oe/recipes-connectivity/ace/files/ace_config.patch b/meta-oe/recipes-connectivity/ace/files/ace_config.patch
index 207b85ab9c..1b8e218658 100644
--- a/meta-oe/recipes-connectivity/ace/files/ace_config.patch
+++ b/meta-oe/recipes-connectivity/ace/files/ace_config.patch
@@ -6,7 +6,6 @@ diff -ruN ACE_wrappers1/ace/config.h ACE_wrappers/ace/config.h
diff -ruN ACE_wrappers1/include/makeinclude/platform_macros.GNU ACE_wrappers/include/makeinclude/platform_macros.GNU
--- ACE_wrappers1/include/makeinclude/platform_macros.GNU 1970-01-01 02:00:00.000000000 +0200
+++ ACE_wrappers/include/makeinclude/platform_macros.GNU 2018-10-31 15:11:18.265392460 +0200
-@@ -0,0 +1,3 @@
+@@ -0,0 +1,2 @@
+INSTALL_PREFIX = $(D)$(exec_prefix)
-+INSTALL_LIB = $(base_libdir)
+include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU
--
2.25.1
reply other threads:[~2020-06-14 12:37 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200614123734.2396875-1-Martin.Jansa@gmail.com \
--to=martin.jansa@gmail.com \
--cc=openembedded-devel@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.