diff options
| author |   Martin Jansa <martin.jansa@gmail.com> | 2020-06-14 14:37:34 +0200 |
|---|---|---|
| committer |   Khem Raj <raj.khem@gmail.com> | 2020-06-14 22:31:44 -0700 |
| commit | cb56ed6a9df5675f72c4bdc34d641f8184115059 (patch) | |
| tree | 03ef4dff29c1a178cb2811516154a0498dde9d44 /meta-oe/recipes-connectivity | |
| parent | b6979461fdf6709d196efc7485c1e6e0ceace0e0 (diff) | |
| download | meta-openembedded-contrib-cb56ed6a9df5675f72c4bdc34d641f8184115059.tar.gz | |
ace: fix installation paths when usrmerge is used
* 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>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-connectivity')
| -rw-r--r-- | meta-oe/recipes-connectivity/ace/ace_6.5.8.bb | 2 | ||||
| -rw-r--r-- | 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 |