From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1412315-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 006C1158094
for <garchives@archives.gentoo.org>; Sun, 26 Jun 2022 12:54:55 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 16CC1E0831;
Sun, 26 Jun 2022 12:54:55 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id EEF63E0831
for <gentoo-commits@lists.gentoo.org>; Sun, 26 Jun 2022 12:54:54 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 184C3341455
for <gentoo-commits@lists.gentoo.org>; Sun, 26 Jun 2022 12:54:54 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 887834F6
for <gentoo-commits@lists.gentoo.org>; Sun, 26 Jun 2022 12:54:52 +0000 (UTC)
From: "Matthew Smith" <matthew@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Matthew Smith" <matthew@gentoo.org>
Message-ID: <1656248059.78147a1e291cd661a15126c31ff4374675609a94.matthew@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/mold/, sys-devel/mold/files/
X-VCS-Repository: repo/gentoo
X-VCS-Files: sys-devel/mold/files/mold-1.3.0-openssl-pkgconfig.patch sys-devel/mold/mold-9999.ebuild
X-VCS-Directories: sys-devel/mold/files/ sys-devel/mold/
X-VCS-Committer: matthew
X-VCS-Committer-Name: Matthew Smith
X-VCS-Revision: 78147a1e291cd661a15126c31ff4374675609a94
X-VCS-Branch: master
Date: Sun, 26 Jun 2022 12:54:52 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: ee9f0495-b49f-41c2-a1c6-aa97ab206aee
X-Archives-Hash: 1773613db41e1aae6d00b9a04b5b183c
commit: 78147a1e291cd661a15126c31ff4374675609a94
Author: Matthew Smith <matthew <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 26 12:46:10 2022 +0000
Commit: Matthew Smith <matthew <AT> gentoo <DOT> org>
CommitDate: Sun Jun 26 12:54:19 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78147a1e
sys-devel/mold: use pkg-config to find OpenSSL
Signed-off-by: Matthew Smith <matthew <AT> gentoo.org>
.../mold/files/mold-1.3.0-openssl-pkgconfig.patch | 28 ++++++++++++++++++++++
sys-devel/mold/mold-9999.ebuild | 1 +
2 files changed, 29 insertions(+)
diff --git a/sys-devel/mold/files/mold-1.3.0-openssl-pkgconfig.patch b/sys-devel/mold/files/mold-1.3.0-openssl-pkgconfig.patch
new file mode 100644
index 000000000000..d2ed0af47b41
--- /dev/null
+++ b/sys-devel/mold/files/mold-1.3.0-openssl-pkgconfig.patch
@@ -0,0 +1,28 @@
+From a4fde946f49cddf4f7c1eceb3b86ca38375cec1d Mon Sep 17 00:00:00 2001
+From: Matthew Smith <matt@offtopica.uk>
+Date: Sun, 26 Jun 2022 13:44:36 +0100
+Subject: [PATCH] Revert "Do not use pkg-config"
+
+This reverts commit 4ef90d4316bbba3a4b8902e38bf5f68171cc6ab7.
+--- a/Makefile
++++ b/Makefile
+@@ -18,6 +18,9 @@ ifeq ($(origin CXX), default)
+ CXX = c++
+ endif
+
++# Allow overriding pkg-config binary
++PKG_CONFIG = pkg-config
++
+ # If you want to keep symbols in the installed binary, run make with
+ # `STRIP=true` to run /bin/true instead of the strip command.
+ STRIP = strip
+@@ -100,7 +103,8 @@ ifeq ($(OS), Darwin)
+ endif
+
+ ifeq ($(NEEDS_LIBCRYPTO), 1)
+- MOLD_LDFLAGS += -lcrypto
++ MOLD_CXXFLAGS += $(shell $(PKG_CONFIG) --cflags-only-I openssl)
++ MOLD_LDFLAGS += $(shell $(PKG_CONFIG) --libs-only-L openssl) -lcrypto
+ endif
+
+ # '-latomic' flag is needed building on riscv64 system.
diff --git a/sys-devel/mold/mold-9999.ebuild b/sys-devel/mold/mold-9999.ebuild
index 87931221e192..d5c163c1ba90 100644
--- a/sys-devel/mold/mold-9999.ebuild
+++ b/sys-devel/mold/mold-9999.ebuild
@@ -31,6 +31,7 @@ DEPEND="${RDEPEND}"
PATCHES=(
# Bug #841575
"${FILESDIR}"/${PN}-1.2.1-install-nopython.patch
+ "${FILESDIR}"/${PN}-1.3.0-openssl-pkgconfig.patch
)
pkg_pretend() {