public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Mike Gilbert" <floppym@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/openssl/files/
Date: Wed, 22 Feb 2023 19:34:58 +0000 (UTC)	[thread overview]
Message-ID: <1677094171.d9d631a188bd27b62082fd93a7f434b00e458b1b.floppym@gentoo> (raw)

commit:     d9d631a188bd27b62082fd93a7f434b00e458b1b
Author:     Nicholas Vinson <nvinson234 <AT> gmail <DOT> com>
AuthorDate: Wed Feb 22 00:57:55 2023 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Wed Feb 22 19:29:31 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9d631a1

dev-libs/openssl: gentoo.config-1.0.4 clang fix

Update gentoo.config-1.0.4 to better support clang compiler toolchains

Closes: https://bugs.gentoo.org/885901
Signed-off-by: Nicholas Vinson <nvinson234 <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/29711
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 dev-libs/openssl/files/gentoo.config-1.0.4 | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

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)


             reply	other threads:[~2023-02-22 19:35 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-02-22 19:34 Mike Gilbert [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-08-03  5:08 [gentoo-commits] repo/gentoo:master commit in: dev-libs/openssl/files/ Sam James
2023-12-31  2:38 Conrad Kostecki
2023-10-29  3:53 Sam James
2023-10-04 21:45 Conrad Kostecki
2023-05-25 14:59 Mike Gilbert
2023-03-19  3:22 Sam James
2023-02-08 17:17 Sam James
2022-08-19 23:00 Sam James
2022-04-25 10:11 WANG Xuerui
2021-02-12 22:35 Conrad Kostecki
2020-12-17 14:11 Andreas K. Hüttel
2020-04-02 14:56 Mike Gilbert
2019-11-24  0:44 Aaron Bauman
2018-10-31  8:06 Lars Wendler
2018-05-12 20:26 Robin H. Johnson
2018-05-04  7:18 Lars Wendler
2016-08-26 17:56 Mike Gilbert
2016-02-26 22:51 Doug Goldstein
2016-01-17  9:01 Mike Frysinger

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1677094171.d9d631a188bd27b62082fd93a7f434b00e458b1b.floppym@gentoo \
    --to=floppym@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox