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>
This commit is contained in:
Naveen Saini 2020-04-02 17:33:10 +08:00 committed by Anuj Mittal
parent f6e239a37e
commit 516a3c16cc
2 changed files with 4 additions and 35 deletions

View File

@ -3,17 +3,16 @@ DESCRIPTION = "C++ network programming framework that implements many core \
patterns for concurrent communication software"
LICENSE = "ACE-TAO-CIAO"
HOMEPAGE = "http://www.dre.vanderbilt.edu/~schmidt/ACE.html"
LIC_FILES_CHKSUM = "file://COPYING;md5=407a202d1b887b998dc9480442840630"
LIC_FILES_CHKSUM = "file://COPYING;md5=96ef88a5529594698e8ceabdd47df92c"
DEPENDS += "openssl gperf-native"
SRC_URI = "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_3/ACE-${PV}.tar.bz2 \
SRC_URI = "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_8/ACE-${PV}.tar.bz2 \
file://ace_config.patch \
file://config_linux.patch \
"
SRC_URI[md5sum] = "4cc5f109ebd17cd56f0539d1b47d16b3"
SRC_URI[sha256sum] = "b1d6a716394bd15c21bb90037b8a12a4d8034cc9d8878b0ad39b3c467df19b1a"
SRC_URI[md5sum] = "a6ba6a944612fe0696c90cbb5c3078ee"
SRC_URI[sha256sum] = "cda2a960dbb9970a907663627711b2e2b14b3484a2859ae936370bcad0b16923"
COMPATIBLE_HOST_libc-musl = "null"

View File

@ -1,30 +0,0 @@
config-linux.h: fix glibc build failure
Recent glibc v2.30 dropped XSI STREAMS declarations,
which causing below build failure.
poky/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
| 56 | # include /**/ <stropts.h>
| | ^~~~~~~~~~~
| compilation terminated.
Added GLIBC checks for affected versions.
For more information about glibc v2.30 change, please check:
https://sourceware.org/git/?p=glibc.git;a=commit;h=a0a0dc83173ce11ff45105fd32e5d14356cdfb9c
Upstream-Status: Submitted [https://github.com/DOCGroup/ACE_TAO/pull/939]
Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
--- ACE_wrappers_original/ace/config-linux.h 2018-11-19 17:45:53.163139000 +0800
+++ ACE_wrappers/ace/config-linux.h 2019-08-13 17:04:17.620866464 +0800
@@ -295,7 +295,7 @@
// Starting with FC9 rawhide this file is not available anymore but
// this define is set
-#if defined _XOPEN_STREAMS && _XOPEN_STREAMS == -1
+#if (defined(__GLIBC__) && (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 30)) || (defined _XOPEN_STREAMS && _XOPEN_STREAMS == -1)
# define ACE_LACKS_STROPTS_H
# define ACE_LACKS_STRRECVFD
#endif