License-Update: URI updates [1] [2] Fix build with glibc 2.32 while here
[1] https://github.com/DOCGroup/ACE_TAO/commit/5564c9667dc17bc7826e54efe7dae79334218a03#diff-134809fa00f40b726d607f36dffcc5cc [2] https://github.com/DOCGroup/ACE_TAO/commit/289a4a8e0006f7a20e8de568334f74ba74f7a4bf#diff-134809fa00f40b726d607f36dffcc5cc Signed-off-by: Khem Raj <[email protected]> --- .../ace/{ace_6.5.8.bb => ace_6.5.10.bb} | 8 +++---- .../ace/files/no_sysctl.patch | 22 +++++++++++++++++++ 2 files changed, 26 insertions(+), 4 deletions(-) rename meta-oe/recipes-connectivity/ace/{ace_6.5.8.bb => ace_6.5.10.bb} (80%) create mode 100644 meta-oe/recipes-connectivity/ace/files/no_sysctl.patch diff --git a/meta-oe/recipes-connectivity/ace/ace_6.5.8.bb b/meta-oe/recipes-connectivity/ace/ace_6.5.10.bb similarity index 80% rename from meta-oe/recipes-connectivity/ace/ace_6.5.8.bb rename to meta-oe/recipes-connectivity/ace/ace_6.5.10.bb index e35bce7f3c..df194f95a0 100644 --- a/meta-oe/recipes-connectivity/ace/ace_6.5.8.bb +++ b/meta-oe/recipes-connectivity/ace/ace_6.5.10.bb @@ -3,16 +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=96ef88a5529594698e8ceabdd47df92c" +LIC_FILES_CHKSUM = "file://COPYING;md5=d2c090e9c730fd91677782d8e2091d77" DEPENDS += "openssl gperf-native" -SRC_URI = "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_8/ACE-${PV}.tar.bz2 \ +SRC_URI = "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_10/ACE-${PV}.tar.bz2 \ file://ace_config.patch \ + file://no_sysctl.patch \ " -SRC_URI[md5sum] = "a6ba6a944612fe0696c90cbb5c3078ee" -SRC_URI[sha256sum] = "cda2a960dbb9970a907663627711b2e2b14b3484a2859ae936370bcad0b16923" +SRC_URI[sha256sum] = "90de437926928e98e9fd9132c7c3e886ca79f25567adeccbc24a5996f230d8e2" COMPATIBLE_HOST_libc-musl = "null" diff --git a/meta-oe/recipes-connectivity/ace/files/no_sysctl.patch b/meta-oe/recipes-connectivity/ace/files/no_sysctl.patch new file mode 100644 index 0000000000..278893114c --- /dev/null +++ b/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 <[email protected]> +--- 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) -- 2.27.0
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#85847): https://lists.openembedded.org/g/openembedded-devel/message/85847 Mute This Topic: https://lists.openembedded.org/mt/75713331/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
