aboutsummaryrefslogtreecommitdiffstats
path: root/meta-oe
diff options
context:
space:
mode:
Diffstat (limited to 'meta-oe')
-rw-r--r--meta-oe/recipes-connectivity/ace/ace_6.5.8.bb2
-rw-r--r--meta-oe/recipes-connectivity/ace/files/ace_config.patch3
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