summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNaveen Saini <naveen.kumar.saini@intel.com>2020-04-02 09:33:10 (GMT)
committerAnuj Mittal <anuj.mittal@intel.com>2020-04-04 10:22:52 (GMT)
commit516a3c16ccb340f98e9a3243b2949959519844a8 (patch)
tree7f5bdfdbacd0ed40a3ea5a167791670a2810a05f
parentf6e239a37e8a4884b422127a8761be16405099d1 (diff)
downloadmeta-intel-516a3c16ccb340f98e9a3243b2949959519844a8.tar.gz
ace: upgrade 6.5.3 -> 6.5.8
Drop patch, which is already upstream. COPYING has copyright year update. Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com> Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
-rw-r--r--recipes-bsp/ace/ace_6.5.8.bb (renamed from recipes-bsp/ace/ace_6.5.3.bb)9
-rw-r--r--recipes-bsp/ace/files/config_linux.patch30
2 files changed, 4 insertions, 35 deletions
diff --git a/recipes-bsp/ace/ace_6.5.3.bb b/recipes-bsp/ace/ace_6.5.8.bb
index db150b1..87197ae 100644
--- a/recipes-bsp/ace/ace_6.5.3.bb
+++ b/recipes-bsp/ace/ace_6.5.8.bb
@@ -3,17 +3,16 @@ DESCRIPTION = "C++ network programming framework that implements many core \
3patterns for concurrent communication software" 3patterns for concurrent communication software"
4LICENSE = "ACE-TAO-CIAO" 4LICENSE = "ACE-TAO-CIAO"
5HOMEPAGE = "http://www.dre.vanderbilt.edu/~schmidt/ACE.html" 5HOMEPAGE = "http://www.dre.vanderbilt.edu/~schmidt/ACE.html"
6LIC_FILES_CHKSUM = "file://COPYING;md5=407a202d1b887b998dc9480442840630" 6LIC_FILES_CHKSUM = "file://COPYING;md5=96ef88a5529594698e8ceabdd47df92c"
7 7
8DEPENDS += "openssl gperf-native" 8DEPENDS += "openssl gperf-native"
9 9
10SRC_URI = "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_3/ACE-${PV}.tar.bz2 \ 10SRC_URI = "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_8/ACE-${PV}.tar.bz2 \
11 file://ace_config.patch \ 11 file://ace_config.patch \
12 file://config_linux.patch \
13 " 12 "
14 13
15SRC_URI[md5sum] = "4cc5f109ebd17cd56f0539d1b47d16b3" 14SRC_URI[md5sum] = "a6ba6a944612fe0696c90cbb5c3078ee"
16SRC_URI[sha256sum] = "b1d6a716394bd15c21bb90037b8a12a4d8034cc9d8878b0ad39b3c467df19b1a" 15SRC_URI[sha256sum] = "cda2a960dbb9970a907663627711b2e2b14b3484a2859ae936370bcad0b16923"
17 16
18COMPATIBLE_HOST_libc-musl = "null" 17COMPATIBLE_HOST_libc-musl = "null"
19 18
diff --git a/recipes-bsp/ace/files/config_linux.patch b/recipes-bsp/ace/files/config_linux.patch
deleted file mode 100644
index 323a63e..0000000
--- a/recipes-bsp/ace/files/config_linux.patch
+++ /dev/null
@@ -1,30 +0,0 @@
1config-linux.h: fix glibc build failure
2
3Recent glibc v2.30 dropped XSI STREAMS declarations,
4which causing below build failure.
5
6poky/build/tmp/work/corei7-64-poky-linux/ace/6.5.3-r0/ACE_wrappers/ace/os_include/os_stropts.h:56:17: fatal error: stropts.h: No such file or directory
7| 56 | # include /**/ <stropts.h>
8| | ^~~~~~~~~~~
9| compilation terminated.
10
11Added GLIBC checks for affected versions.
12
13For more information about glibc v2.30 change, please check:
14https://sourceware.org/git/?p=glibc.git;a=commit;h=a0a0dc83173ce11ff45105fd32e5d14356cdfb9c
15
16Upstream-Status: Submitted [https://github.com/DOCGroup/ACE_TAO/pull/939]
17
18Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
19
20--- ACE_wrappers_original/ace/config-linux.h 2018-11-19 17:45:53.163139000 +0800
21+++ ACE_wrappers/ace/config-linux.h 2019-08-13 17:04:17.620866464 +0800
22@@ -295,7 +295,7 @@
23
24 // Starting with FC9 rawhide this file is not available anymore but
25 // this define is set
26-#if defined _XOPEN_STREAMS && _XOPEN_STREAMS == -1
27+#if (defined(__GLIBC__) && (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 30)) || (defined _XOPEN_STREAMS && _XOPEN_STREAMS == -1)
28 # define ACE_LACKS_STROPTS_H
29 # define ACE_LACKS_STRRECVFD
30 #endif