From 71fb24e4cc15fe73651423df81c5e6a79fa8c142 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 22 Feb 2023 20:29:22 +0000 Subject: gentoo auto-resync : 22:02:2023 - 20:29:22 --- dev-libs/openssl/Manifest | 2 +- dev-libs/openssl/files/gentoo.config-1.0.4 | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'dev-libs/openssl') diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest index 0bb2b5bf4570..996a974a18d9 100644 --- a/dev-libs/openssl/Manifest +++ b/dev-libs/openssl/Manifest @@ -1,6 +1,6 @@ AUX gentoo.config-1.0.2 5302 BLAKE2B b699533ed86c48c0d033092b4d901de837a6a495113925099d82cd2f768b521073a3caad06921e2f8d3ecdf4c4ef617ed9b9aba119d4a910b72f9c086b9fd21f SHA512 f8653c57ef8e3a3b3b762f66ef556c0012dfc8b997f0bdbe504f92d0901c0dc9fefa2c3e8244175d802fb83437533b7928b6db38b93fdd5a8ffefa79414106a1 AUX gentoo.config-1.0.3 5300 BLAKE2B c2788ef1b790bdf2cadaf302e9576984f4536c7cf6e48610f986468ee712cf6fc3fed3bce1e0d2eea296811edc3266a6a248b2faa48557cb430e101ea2cea6ff SHA512 6609e9180bfbc6b9e365b53115da4f83e837aac4edc24e18cd09a2c4595d478c14476d0a1f5387ce5130bcf3effeeac605859f69ac7923408a1809e9c8b13489 -AUX gentoo.config-1.0.4 5538 BLAKE2B af8c3079d2a6bc1adc7192c71e09ab743dc5bad2744b304b52510f11b1d1e1a9208865d006e2667a6bd709817fd29c68c30a6d08fa2b442af60022b39b061957 SHA512 ec951559ea4af58d213ace5753129abcde10fa07d08bfe59b615a7e0d52fce628520b906df4015a8f128dc2be707ab05c801aac83d6347fcacfeb00b2ae02f8d +AUX gentoo.config-1.0.4 5624 BLAKE2B 3db6ca219dae54bb33abfec0b91b17b453222d50884f31e294a47c985fde99ae8ed3189ad41b0b2d76af4006dc547050c38ce19413b2b7d8307d23c5b510f4b6 SHA512 d912c4adb5508c28f342c2741ef1d1bbc870073a3d4894ad8c6c5b9866e842430f5a23d2f6704d2d449546568313b6438b36b5012bcc037fedb5c8181a9de7de AUX openssl-1.1.0j-parallel_install_fix.patch 515 BLAKE2B a1bcffce4dc9e0566e21e753cf1a18ee6eac92aca5880c50b33966d8ecb391f7430e1db6ea5a30ee4e3a9d77fb9e5542e864508b01c325011e368165e079a96c SHA512 0badd29ec8cffd95b2b69a4b8f8eecfc9ea0c00a812b298a650ee353e3965147fd2da1f9058d2d51744838f38168257b89aaf317287c55a7b76f16a69c781828 AUX openssl-1.1.1i-riscv32.patch 2557 BLAKE2B 97e51303706ee96d3fae46959b91d1021dcbb3efa421866f6e09bbee6287aae95c6f5d9498bd9d8974b0de747ef696242691cfebec90b31dc9e2cc31b41b81ec SHA512 f75ae1034bb9dda7f4959e8a5d6d0dae21200723d82aebfbea58bd1d7775ef4042e49fdf49d5738771d79d764e44a1b6e0da341d210ea51d21516bb3874b626a AUX openssl-3.0.7-x509-CVE-2022-3996.patch 1126 BLAKE2B 9d873e4e63417a4e25b764e1f639a118dc39493e97f4de2ec436058d4515702daae251799ec656c27139e9c2a46ea750c5f0cdaf032d5e7fe3b9916aa5a9fbb1 SHA512 c0e319485e8b3dd02854e0ef1e3a2bee2c5dc01ecc470fad9e4425f43ae4fdb1c4fa70441abed9bdb7833dfdf7e1da164a0461354538d71e4a185bbd80bf0b47 diff --git a/dev-libs/openssl/files/gentoo.config-1.0.4 b/dev-libs/openssl/files/gentoo.config-1.0.4 index 573a97de3543..79f6331f090c 100644 --- a/dev-libs/openssl/files/gentoo.config-1.0.4 +++ b/dev-libs/openssl/files/gentoo.config-1.0.4 @@ -77,7 +77,9 @@ fi # Detect target arch machine="" +submachine="" chost_machine=${CHOST%%-*} +[[ ${CC} == *clang* ]] && submachine="-clang" case ${system} in linux) case ${chost_machine}:${ABI} in @@ -95,7 +97,7 @@ linux) # hppa64*) machine=parisc64;; hppa*) machine="generic32 -DB_ENDIAN";; i[0-9]86*|\ - x86_64*:x86) machine=x86;; + x86_64*:x86) machine=x86${submachine};; ia64*) machine=ia64;; loongarch64*) machine="loongarch64 -DL_ENDIAN" system=linux64;; m68*) machine="latomic -DB_ENDIAN";; @@ -125,7 +127,7 @@ linux) s390x*) machine=s390x system=linux64;; s390*) machine="generic32 -DB_ENDIAN";; x86_64*:x32) machine=x32;; - x86_64*) machine=x86_64;; + x86_64*) machine=x86_64${submachine};; esac ;; BSD) -- cgit v1.2.3