Drop patch, which is already upstream. COPYING has copyright year update.
Signed-off-by: Naveen Saini <[email protected]> --- recipes-bsp/ace/{ace_6.5.3.bb => ace_6.5.8.bb} | 9 ++++---- recipes-bsp/ace/files/config_linux.patch | 30 -------------------------- 2 files changed, 4 insertions(+), 35 deletions(-) rename recipes-bsp/ace/{ace_6.5.3.bb => ace_6.5.8.bb} (75%) delete mode 100644 recipes-bsp/ace/files/config_linux.patch diff --git a/recipes-bsp/ace/ace_6.5.3.bb b/recipes-bsp/ace/ace_6.5.8.bb similarity index 75% rename from recipes-bsp/ace/ace_6.5.3.bb rename to 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 \ 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" 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 @@ -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 <[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 @@ - - // 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 -- 2.7.4
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#6459): https://lists.yoctoproject.org/g/meta-intel/message/6459 Mute This Topic: https://lists.yoctoproject.org/mt/72720995/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-intel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
