summaryrefslogtreecommitdiff
path: root/meta-openembedded/meta-oe/recipes-connectivity/ace/files
diff options
context:
space:
mode:
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-connectivity/ace/files')
-rw-r--r--meta-openembedded/meta-oe/recipes-connectivity/ace/files/ace_config.patch11
-rw-r--r--meta-openembedded/meta-oe/recipes-connectivity/ace/files/no_sysctl.patch22
2 files changed, 33 insertions, 0 deletions
diff --git a/meta-openembedded/meta-oe/recipes-connectivity/ace/files/ace_config.patch b/meta-openembedded/meta-oe/recipes-connectivity/ace/files/ace_config.patch
new file mode 100644
index 000000000..1b8e21865
--- /dev/null
+++ b/meta-openembedded/meta-oe/recipes-connectivity/ace/files/ace_config.patch
@@ -0,0 +1,11 @@
+diff -ruN ACE_wrappers1/ace/config.h ACE_wrappers/ace/config.h
+--- ACE_wrappers1/ace/config.h 1970-01-01 02:00:00.000000000 +0200
++++ ACE_wrappers/ace/config.h 2019-01-10 13:36:52.698012477 +0200
+@@ -0,0 +1,1 @@
++#include "ace/config-linux.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,2 @@
++INSTALL_PREFIX = $(D)$(exec_prefix)
++include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU
diff --git a/meta-openembedded/meta-oe/recipes-connectivity/ace/files/no_sysctl.patch b/meta-openembedded/meta-oe/recipes-connectivity/ace/files/no_sysctl.patch
new file mode 100644
index 000000000..278893114
--- /dev/null
+++ b/meta-openembedded/meta-oe/recipes-connectivity/ace/files/no_sysctl.patch
@@ -0,0 +1,22 @@
+glibc >= 2.32 has removed sys/sysctl.h see
+
+https://sourceware.org/git/?p=glibc.git;a=commit;h=076f09afbac1aa57756faa7a8feadb7936a724e4
+
+This check therefore ensures that its only used on linux when glibc has support for it
+
+Upstream-Status: Pending
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+--- a/ace/config-linux.h
++++ b/ace/config-linux.h
+@@ -20,6 +20,10 @@
+
+ #include "ace/config-linux-common.h"
+
++#if (__GLIBC__ > 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 32)
++# define ACE_LACKS_SYS_SYSCTL_H
++#endif
++
+ #define ACE_HAS_BYTESEX_H
+
+ #if (defined _XOPEN_SOURCE && (_XOPEN_SOURCE - 0) >= 500)