From: Wang Mingyu <[email protected]> License-Update: Copyright year updated to 2024.
0001-fix-aarch64-Move-target-pragma-after-arm_neon.h-incl.patch removed since it's included in 1.0.20 Signed-off-by: Wang Mingyu <[email protected]> --- ...-target-pragma-after-arm_neon.h-incl.patch | 49 ------------------- .../libsodium/libsodium_1.0.19.bb | 14 ------ .../libsodium/libsodium_1.0.20.bb | 12 +++++ 3 files changed, 12 insertions(+), 63 deletions(-) delete mode 100644 meta-oe/recipes-crypto/libsodium/libsodium/0001-fix-aarch64-Move-target-pragma-after-arm_neon.h-incl.patch delete mode 100644 meta-oe/recipes-crypto/libsodium/libsodium_1.0.19.bb create mode 100644 meta-oe/recipes-crypto/libsodium/libsodium_1.0.20.bb diff --git a/meta-oe/recipes-crypto/libsodium/libsodium/0001-fix-aarch64-Move-target-pragma-after-arm_neon.h-incl.patch b/meta-oe/recipes-crypto/libsodium/libsodium/0001-fix-aarch64-Move-target-pragma-after-arm_neon.h-incl.patch deleted file mode 100644 index 7a6fae799..000000000 --- a/meta-oe/recipes-crypto/libsodium/libsodium/0001-fix-aarch64-Move-target-pragma-after-arm_neon.h-incl.patch +++ /dev/null @@ -1,49 +0,0 @@ -From d3253310f7c0fc0f1aad6864e3b57958ea1bb9c5 Mon Sep 17 00:00:00 2001 -From: tux3 <[email protected]> -Date: Mon, 16 Oct 2023 16:42:04 +0200 -Subject: [PATCH] fix(aarch64): Move target #pragma after arm_neon.h include - -Fix per https://github.com/android/ndk/issues/1945 - -If the pragma is done before the header include, -in NDK 26 the attribute may apply to the functions in arm_neon.h - -Upstream-Status: Backport [https://github.com/jedisct1/libsodium/pull/1321] -Signed-off-by: Khem Raj <[email protected]> ---- - .../aes256gcm/armcrypto/aead_aes256gcm_armcrypto.c | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/src/libsodium/crypto_aead/aes256gcm/armcrypto/aead_aes256gcm_armcrypto.c b/src/libsodium/crypto_aead/aes256gcm/armcrypto/aead_aes256gcm_armcrypto.c -index 0a5a128..aa76f5c 100644 ---- a/src/libsodium/crypto_aead/aes256gcm/armcrypto/aead_aes256gcm_armcrypto.c -+++ b/src/libsodium/crypto_aead/aes256gcm/armcrypto/aead_aes256gcm_armcrypto.c -@@ -19,12 +19,6 @@ - #define __vectorcall - #endif - --#ifdef __clang__ --#pragma clang attribute push(__attribute__((target("neon,crypto,aes"))), apply_to = function) --#elif defined(__GNUC__) --#pragma GCC target("+simd+crypto") --#endif -- - #ifndef __ARM_FEATURE_CRYPTO - #define __ARM_FEATURE_CRYPTO 1 - #endif -@@ -34,6 +28,12 @@ - - #include <arm_neon.h> - -+#ifdef __clang__ -+#pragma clang attribute push(__attribute__((target("neon,crypto,aes"))), apply_to = function) -+#elif defined(__GNUC__) -+#pragma GCC target("+simd+crypto") -+#endif -+ - #define ABYTES crypto_aead_aes256gcm_ABYTES - #define NPUBBYTES crypto_aead_aes256gcm_NPUBBYTES - #define KEYBYTES crypto_aead_aes256gcm_KEYBYTES --- -2.42.1 - diff --git a/meta-oe/recipes-crypto/libsodium/libsodium_1.0.19.bb b/meta-oe/recipes-crypto/libsodium/libsodium_1.0.19.bb deleted file mode 100644 index 2e678f3f0..000000000 --- a/meta-oe/recipes-crypto/libsodium/libsodium_1.0.19.bb +++ /dev/null @@ -1,14 +0,0 @@ -SUMMARY = "The Sodium crypto library" -HOMEPAGE = "http://libsodium.org/"; -BUGTRACKER = "https://github.com/jedisct1/libsodium/issues"; -LICENSE = "ISC" -LIC_FILES_CHKSUM = "file://LICENSE;md5=49ce3b426e6a002e23a1387248e6dbe9" - -SRC_URI = "https://download.libsodium.org/libsodium/releases/${BPN}-${PV}.tar.gz \ - file://0001-fix-aarch64-Move-target-pragma-after-arm_neon.h-incl.patch" -SRC_URI[sha256sum] = "018d79fe0a045cca07331d37bd0cb57b2e838c51bc48fd837a1472e50068bbea" - -inherit autotools - -S = "${WORKDIR}/libsodium-stable" -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-crypto/libsodium/libsodium_1.0.20.bb b/meta-oe/recipes-crypto/libsodium/libsodium_1.0.20.bb new file mode 100644 index 000000000..63d21576b --- /dev/null +++ b/meta-oe/recipes-crypto/libsodium/libsodium_1.0.20.bb @@ -0,0 +1,12 @@ +SUMMARY = "The Sodium crypto library" +HOMEPAGE = "http://libsodium.org/"; +BUGTRACKER = "https://github.com/jedisct1/libsodium/issues"; +LICENSE = "ISC" +LIC_FILES_CHKSUM = "file://LICENSE;md5=c59be7bb29f8e431b5f2d690b6734185" + +SRC_URI = "https://download.libsodium.org/libsodium/releases/${BPN}-${PV}.tar.gz"; +SRC_URI[sha256sum] = "ebb65ef6ca439333c2bb41a0c1990587288da07f6c7fd07cb3a18cc18d30ce19" + +inherit autotools + +BBCLASSEXTEND = "native nativesdk" -- 2.34.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#110732): https://lists.openembedded.org/g/openembedded-devel/message/110732 Mute This Topic: https://lists.openembedded.org/mt/106519712/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
