From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 393E2159C9B for ; Sat, 10 Aug 2024 20:34:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3E9052BC0D9; Sat, 10 Aug 2024 20:34:43 +0000 (UTC) Received: from smtp.gentoo.org (mail.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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 23C402BC0D9 for ; Sat, 10 Aug 2024 20:34:43 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 63FDE343010 for ; Sat, 10 Aug 2024 20:34:42 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 79F6E1EDA for ; Sat, 10 Aug 2024 20:34:39 +0000 (UTC) From: "Lucio Sauer" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lucio Sauer" Message-ID: <1723305444.4ea75ccb1674776ca811a0b2df41c83ea48fb9a2.watermanpaint@gentoo> Subject: [gentoo-commits] repo/proj/guru:master commit in: dev-lang/swift/ X-VCS-Repository: repo/proj/guru X-VCS-Files: dev-lang/swift/swift-5.10.1.ebuild X-VCS-Directories: dev-lang/swift/ X-VCS-Committer: watermanpaint X-VCS-Committer-Name: Lucio Sauer X-VCS-Revision: 4ea75ccb1674776ca811a0b2df41c83ea48fb9a2 X-VCS-Branch: master Date: Sat, 10 Aug 2024 20:34:39 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 3c5b4b47-cc83-4671-9744-22a4b8eb21a0 X-Archives-Hash: b04dddbb2bb3119792ef30290e6c5254 commit: 4ea75ccb1674776ca811a0b2df41c83ea48fb9a2 Author: Itai Ferber itaiferber net> AuthorDate: Sat Aug 10 15:57:24 2024 +0000 Commit: Lucio Sauer posteo net> CommitDate: Sat Aug 10 15:57:24 2024 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=4ea75ccb dev-lang/swift: ebuild correctness fixes Signed-off-by: Itai Ferber itaiferber.net> dev-lang/swift/swift-5.10.1.ebuild | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dev-lang/swift/swift-5.10.1.ebuild b/dev-lang/swift/swift-5.10.1.ebuild index a53eb87d5..4037a47c9 100644 --- a/dev-lang/swift/swift-5.10.1.ebuild +++ b/dev-lang/swift/swift-5.10.1.ebuild @@ -49,10 +49,10 @@ SRC_URI=" https://github.com/unicode-org/icu/archive/refs/tags/release-69-1.tar.gz -> icu-69.1.tar.gz " -PATCHES=" - ${FILESDIR}/${P}-link-with-lld.patch - ${FILESDIR}/${P}-llbuild-link-ncurses-tinfo-gentoo.patch -" +PATCHES=( + "${FILESDIR}/${P}-link-with-lld.patch" + "${FILESDIR}/${P}-llbuild-link-ncurses-tinfo-gentoo.patch" +) S="${WORKDIR}" LICENSE="Apache-2.0" @@ -234,7 +234,7 @@ src_install() { # `libicudataswift.so.69.1` has an empty `DT_RUNPATH`, which fails # `rpath_security_checks`. It contains only data, so we can remove its rpath # altogether. - patchelf --remove-rpath "${S}/stage2/usr/lib/swift/linux/libicudataswift.so.69.1" + patchelf --remove-rpath "${S}/stage2/usr/lib/swift/linux/libicudataswift.so.69.1" || die # The Swift build output is intended to be self-contained, and is # _significantly_ easier to leave as-is than attempt to splat onto the @@ -249,6 +249,7 @@ src_install() { # exposed externally, so we'll just symlink Swift-specific binaries into # `/usr/bin`. (The majority of executables don't need to be exposed as # `swift ` calls `swift-` directly.) + local bin for bin in swift swiftc sourcekit-lsp; do dosym -r "${dest_dir}/usr/bin/${bin}" "/usr/bin/${bin}" done