mirrors/guru
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/guru.git synced 2026-07-09 15:13:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

dev-lang/swift: fix symlinking on install

Browse Source 
On `pkg_postinst`, `has_version` wasn't returning the expected value in
order to symlink Swift on first install; instead, we can use `eselect
swift show` itself to be able to tell whether we're eligible to update
the symlinks.

Closes: https://bugs.gentoo.org/951175
Signed-off-by: Itai Ferber <itai@itaiferber.net>
This commit is contained in:
Itai Ferber
2025-03-26 15:43:03 -04:00
parent 92283709cc
commit fdc4461cb8
2 changed files with 40 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
dev-lang/swift/swift-5.10.1-r4.ebuild
View File

@@ -71,7 +71,7 @@ RESTRICT="strip"
RDEPEND="
${PYTHON_DEPS}
>=app-arch/zstd-1.5
>=app-eselect/eselect-swift-1.0
>=app-eselect/eselect-swift-1.0-r1
>=dev-db/sqlite-3
>=dev-libs/icu-69
>=dev-libs/libedit-20221030
@@ -106,6 +106,8 @@ BDEPEND="
' python3_{12..13})
"
PKG_PREINST_SWIFT_INTENTIONALLY_SET='true'
# Adapted from `flag-o-matic.eclass`'s `raw-ldflags`: turns GCC-style flags
# (`-Wl,-foo`) into Clang-style flags (`-Xlinker -foo`).
clang-ldflags() {
@@ -357,12 +359,22 @@ src_install() {
done
}
pkg_preinst() {
# After installation, we ideally want the system to have the latest Swift
# version set -- but if the system already has a Swift version set and it
# isn't the latest version, that's likely an intentional decision that we
# don't want to override.
local current_swift_version="$(eselect swift show | tail -n1 | xargs)"
local latest_swift_version="$(eselect swift show --latest | tail -n1 | xargs)"
[[ "${current_swift_version}" == '(unset)' ]] \
|| [[ "${current_swift_version}" == "${latest_swift_version}" ]] \
&& PKG_PREINST_SWIFT_INTENTIONALLY_SET='false'
}
pkg_postinst() {
# If we're installing the latest version of Swift, then update symlinks to
# it. (We don't want to call `eselect swift update` unconditionally in case
# we're installing an older version of Swift, and the user has intentionally
# selected a version other than the latest.)
if ! has_version ">${CATEGORY}/${P}"; then
# If the system doesn't have Swift intentionally set to an older version, we
# can update to the latest.
if [[ "${PKG_PREINST_SWIFT_INTENTIONALLY_SET}" == 'false' ]]; then
eselect swift update
fi
}
@@ -370,8 +382,8 @@ pkg_postinst() {
pkg_postrm() {
# We don't want to leave behind symlinks pointing to this Swift version on
# removal.
local eselect_swift_version="$(eselect swift show)"
if [[ "${eselect_swift_version}" == *"${P}" ]]; then
local current_swift_version="$(eselect swift show | tail -n1 | xargs)"
if [[ "${current_swift_version}" == "${P}" ]]; then
eselect swift update
fi
}

28
dev-lang/swift/swift-6.0.3-r1.ebuild
View File

@@ -72,6 +72,7 @@ RDEPEND="
${PYTHON_DEPS}
!~dev-lang/swift-5.10.1:0
>=app-arch/zstd-1.5
>=app-eselect/eselect-swift-1.0-r1
>=dev-db/sqlite-3
>=dev-libs/icu-69
>=dev-libs/libedit-20221030
@@ -79,7 +80,6 @@ RDEPEND="
>=net-misc/curl-8.4
>=sys-libs/ncurses-6
>=sys-libs/zlib-1.3
app-eselect/eselect-swift
dev-lang/python
$(llvm_gen_dep 'llvm-core/lld:${LLVM_SLOT}=')
"
@@ -114,6 +114,7 @@ BDEPEND="
SWIFT_BUILD_PRESETS_INI_PATH="${S}/gentoo-build-presets.ini"
SWIFT_BUILD_PRESET='gentoo'
PKG_PREINST_SWIFT_INTENTIONALLY_SET='true'
# Adapted from `flag-o-matic.eclass`'s `raw-ldflags`: turns GCC-style flags
# (`-Wl,-foo`) into Clang-style flags (`-Xlinker -foo`).
@@ -276,12 +277,22 @@ src_install() {
done
}
pkg_preinst() {
# After installation, we ideally want the system to have the latest Swift
# version set -- but if the system already has a Swift version set and it
# isn't the latest version, that's likely an intentional decision that we
# don't want to override.
local current_swift_version="$(eselect swift show | tail -n1 | xargs)"
local latest_swift_version="$(eselect swift show --latest | tail -n1 | xargs)"
[[ "${current_swift_version}" == '(unset)' ]] \
|| [[ "${current_swift_version}" == "${latest_swift_version}" ]] \
&& PKG_PREINST_SWIFT_INTENTIONALLY_SET='false'
}
pkg_postinst() {
# If we're installing the latest version of Swift, then update symlinks to
# it. (We don't want to call `eselect swift update` unconditionally in case
# we're installing an older version of Swift, and the user has intentionally
# selected a version other than the latest.)
if ! has_version ">${CATEGORY}/${P}"; then
# If the system doesn't have Swift intentionally set to an older version, we
# can update to the latest.
if [[ "${PKG_PREINST_SWIFT_INTENTIONALLY_SET}" == 'false' ]]; then
eselect swift update
fi
}
@@ -289,8 +300,9 @@ pkg_postinst() {
pkg_postrm() {
# We don't want to leave behind symlinks pointing to this Swift version on
# removal.
local eselect_swift_version="$(eselect swift show)"
if [[ "${eselect_swift_version}" == *"${P}" ]]; then
local current_swift_version="$(eselect swift show | tail -n1 | xargs)"
if [[ "${current_swift_version}" == "${P}" ]]; then
eselect swift update
fi
}