commit: e8d2ae01189188f70baf03fc8e563a15ebb8def7 Author: Eric Joldasov <bratishkaerik <AT> landless-city <DOT> net> AuthorDate: Tue Apr 22 06:01:21 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed May 21 21:51:37 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8d2ae01
dev-lang/zig: fix installing in Gentoo Prefix Closes: https://bugs.gentoo.org/954126 Signed-off-by: Eric Joldasov <bratishkaerik <AT> landless-city.net> Part-of: https://github.com/gentoo/gentoo/pull/41651 Closes: https://github.com/gentoo/gentoo/pull/41651 Signed-off-by: Sam James <sam <AT> gentoo.org> dev-lang/zig/zig-0.13.0-r3.ebuild | 6 +++--- dev-lang/zig/zig-0.14.0.ebuild | 6 +++--- dev-lang/zig/zig-9999.ebuild | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dev-lang/zig/zig-0.13.0-r3.ebuild b/dev-lang/zig/zig-0.13.0-r3.ebuild index ab31d3b108ba..56341c22e5b2 100644 --- a/dev-lang/zig/zig-0.13.0-r3.ebuild +++ b/dev-lang/zig/zig-0.13.0-r3.ebuild @@ -89,7 +89,7 @@ pkg_setup() { declare -r -g ZIG_VER="${PV}" ZIG_EXE="not-applicable" zig_pkg_setup - declare -r -g ZIG_SYS_INSTALL_DEST="${EPREFIX}/usr/$(get_libdir)/zig/${PV}" + declare -r -g ZIG_SYS_INSTALL_DEST="/usr/$(get_libdir)/zig/${PV}" if use llvm; then [[ ${MERGE_TYPE} != binary ]] && llvm_cbuild_setup @@ -144,7 +144,7 @@ src_configure() { local my_zbs_args=( --zig-lib-dir "${S}/lib/" - --prefix "${ZIG_SYS_INSTALL_DEST}/" + --prefix "${EPREFIX}/${ZIG_SYS_INSTALL_DEST}/" --prefix-lib-dir lib/ # These are built separately @@ -326,7 +326,7 @@ src_install() { ZIG_EXE="./zig2" zig_src_install - cd "${D}/${ZIG_SYS_INSTALL_DEST}" || die + cd "${ED}/${ZIG_SYS_INSTALL_DEST}" || die mv lib/zig/ lib2/ || die rm -rf lib/ || die mv lib2/ lib/ || die diff --git a/dev-lang/zig/zig-0.14.0.ebuild b/dev-lang/zig/zig-0.14.0.ebuild index d47ef3cbf718..975e6b5cd091 100644 --- a/dev-lang/zig/zig-0.14.0.ebuild +++ b/dev-lang/zig/zig-0.14.0.ebuild @@ -83,7 +83,7 @@ pkg_setup() { declare -r -g ZIG_VER="${PV}" ZIG_EXE="not-applicable" zig_pkg_setup - declare -r -g ZIG_SYS_INSTALL_DEST="${EPREFIX}/usr/$(get_libdir)/zig/${PV}" + declare -r -g ZIG_SYS_INSTALL_DEST="/usr/$(get_libdir)/zig/${PV}" if use llvm; then [[ ${MERGE_TYPE} != binary ]] && llvm_cbuild_setup @@ -140,7 +140,7 @@ src_configure() { local my_zbs_args=( --zig-lib-dir "${S}/lib/" - --prefix "${ZIG_SYS_INSTALL_DEST}/" + --prefix "${EPREFIX}/${ZIG_SYS_INSTALL_DEST}/" --prefix-lib-dir lib/ # These are built separately @@ -324,7 +324,7 @@ src_install() { ZIG_EXE="./zig2" zig_src_install - cd "${D}/${ZIG_SYS_INSTALL_DEST}" || die + cd "${ED}/${ZIG_SYS_INSTALL_DEST}" || die mv lib/zig/ lib2/ || die rm -rf lib/ || die mv lib2/ lib/ || die diff --git a/dev-lang/zig/zig-9999.ebuild b/dev-lang/zig/zig-9999.ebuild index b7c405e9bc89..3bd66f06a627 100644 --- a/dev-lang/zig/zig-9999.ebuild +++ b/dev-lang/zig/zig-9999.ebuild @@ -83,7 +83,7 @@ pkg_setup() { declare -r -g ZIG_VER="${PV}" ZIG_EXE="not-applicable" zig_pkg_setup - declare -r -g ZIG_SYS_INSTALL_DEST="${EPREFIX}/usr/$(get_libdir)/zig/${PV}" + declare -r -g ZIG_SYS_INSTALL_DEST="/usr/$(get_libdir)/zig/${PV}" if use llvm; then [[ ${MERGE_TYPE} != binary ]] && llvm_cbuild_setup @@ -140,7 +140,7 @@ src_configure() { local my_zbs_args=( --zig-lib-dir "${S}/lib/" - --prefix "${ZIG_SYS_INSTALL_DEST}/" + --prefix "${EPREFIX}/${ZIG_SYS_INSTALL_DEST}/" --prefix-lib-dir lib/ # These are built separately @@ -324,7 +324,7 @@ src_install() { ZIG_EXE="./zig2" zig_src_install - cd "${D}/${ZIG_SYS_INSTALL_DEST}" || die + cd "${ED}/${ZIG_SYS_INSTALL_DEST}" || die mv lib/zig/ lib2/ || die rm -rf lib/ || die mv lib2/ lib/ || die
