Year changed in COPYING 2018 to 2019. ACE specific updates can be found under 'Changes to ACE' section in release notes: https://github.com/DOCGroup/ACE_TAO/releases
Signed-off-by: Naveen Saini <[email protected]> --- recipes-bsp/ace/{ace_6.5.3.bb => ace_6.5.6.bb} | 8 ++++---- ...fig_linux.patch => config_linux_common.patch} | 16 ++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) rename recipes-bsp/ace/{ace_6.5.3.bb => ace_6.5.6.bb} (77%) rename recipes-bsp/ace/files/{config_linux.patch => config_linux_common.patch} (60%) diff --git a/recipes-bsp/ace/ace_6.5.3.bb b/recipes-bsp/ace/ace_6.5.6.bb similarity index 77% rename from recipes-bsp/ace/ace_6.5.3.bb rename to recipes-bsp/ace/ace_6.5.6.bb index f1a10eea..ba778be1 100644 --- a/recipes-bsp/ace/ace_6.5.3.bb +++ b/recipes-bsp/ace/ace_6.5.6.bb @@ -3,17 +3,17 @@ 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 = "ftp://download.dre.vanderbilt.edu/previous_versions/ACE-${PV}.tar.bz2 \ file://ace_config.patch \ - file://config_linux.patch \ + file://config_linux_common.patch \ " -SRC_URI[md5sum] = "4cc5f109ebd17cd56f0539d1b47d16b3" -SRC_URI[sha256sum] = "b1d6a716394bd15c21bb90037b8a12a4d8034cc9d8878b0ad39b3c467df19b1a" +SRC_URI[md5sum] = "34d12bb391046399756d3d741dde5435" +SRC_URI[sha256sum] = "24dee8978def5f9e538c13d2f86c63631d9406c316d6b89ddc90149411938e96" COMPATIBLE_HOST_libc-musl = "null" diff --git a/recipes-bsp/ace/files/config_linux.patch b/recipes-bsp/ace/files/config_linux_common.patch similarity index 60% rename from recipes-bsp/ace/files/config_linux.patch rename to recipes-bsp/ace/files/config_linux_common.patch index 323a63eb..932d9834 100644 --- a/recipes-bsp/ace/files/config_linux.patch +++ b/recipes-bsp/ace/files/config_linux_common.patch @@ -1,4 +1,4 @@ -config-linux.h: fix glibc build failure +config-linux-common.h: fix glibc build failure Recent glibc v2.30 dropped XSI STREAMS declarations, which causing below build failure. @@ -13,18 +13,18 @@ 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] +Upstream-Status: backport [https://github.com/DOCGroup/ACE_TAO/commit/ea0c67bb9ccf7b22e086f33bdb89f5aa12fc5a4f] Signed-off-by: Naveen Saini <[email protected]> ---- 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 @@ +--- ACE_wrappers_original/ace/config-linux-common.h 2019-08-14 13:26:15.436073844 +0800 ++++ ACE_wrappers/ace/config-linux-common.h 2019-08-30 16:43:02.858205452 +0800 +@@ -173,7 +173,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 ++#if !defined(_XOPEN_STREAMS) || (defined _XOPEN_STREAMS && _XOPEN_STREAMS == -1) + # define ACE_LACKS_STROPTS_H + # define ACE_LACKS_STRRECVFD #endif -- 2.17.1 -- _______________________________________________ meta-intel mailing list [email protected] https://lists.yoctoproject.org/listinfo/meta-intel
