commit: 1a41016d9a8e9e1d056e57fd212a9a92cc6056b8
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 22 23:44:18 2024 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Fri Nov 22 23:44:18 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a41016d
dev-lang/rust: Set PKG_CONFIG and OPENSSL variables with ESYSROOT and not ROOT
This requires moving this code from pkg_setup to src_configure because ESYSROOT
is not valid in the former.
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
dev-lang/rust/rust-1.74.1-r100.ebuild | 12 +++++++-----
dev-lang/rust/rust-1.75.0-r100.ebuild | 12 +++++++-----
dev-lang/rust/rust-1.77.1-r100.ebuild | 12 +++++++-----
dev-lang/rust/rust-1.79.0-r100.ebuild | 12 +++++++-----
dev-lang/rust/rust-1.80.1-r100.ebuild | 12 +++++++-----
dev-lang/rust/rust-1.81.0-r100.ebuild | 12 +++++++-----
dev-lang/rust/rust-1.82.0-r100.ebuild | 12 +++++++-----
7 files changed, 49 insertions(+), 35 deletions(-)
diff --git a/dev-lang/rust/rust-1.74.1-r100.ebuild
b/dev-lang/rust/rust-1.74.1-r100.ebuild
index 158a695500fa..d446b5263782 100644
--- a/dev-lang/rust/rust-1.74.1-r100.ebuild
+++ b/dev-lang/rust/rust-1.74.1-r100.ebuild
@@ -200,11 +200,6 @@ pkg_setup() {
export LIBGIT2_NO_PKG_CONFIG=1 #749381
if tc-is-cross-compiler; then
- export PKG_CONFIG_ALLOW_CROSS=1
- export PKG_CONFIG_PATH="${ROOT}/usr/$(get_libdir)/pkgconfig"
- export OPENSSL_INCLUDE_DIR="${ROOT}/usr/include"
- export OPENSSL_LIB_DIR="${ROOT}/usr/$(get_libdir)"
-
use system-llvm && die "USE=system-llvm not allowed when
cross-compiling"
local cross_llvm_target="$(llvm_tuple_to_target "${CBUILD}")"
use "llvm_targets_${cross_llvm_target}" || \
@@ -223,6 +218,13 @@ pkg_setup() {
}
src_configure() {
+ if tc-is-cross-compiler; then
+ export PKG_CONFIG_ALLOW_CROSS=1
+ export PKG_CONFIG_PATH="${ESYSROOT}/usr/$(get_libdir)/pkgconfig"
+ export OPENSSL_INCLUDE_DIR="${ESYSROOT}/usr/include"
+ export OPENSSL_LIB_DIR="${ESYSROOT}/usr/$(get_libdir)"
+ fi
+
filter-lto # https://bugs.gentoo.org/862109
https://bugs.gentoo.org/866231
local rust_target="" rust_targets="" arch_cflags
diff --git a/dev-lang/rust/rust-1.75.0-r100.ebuild
b/dev-lang/rust/rust-1.75.0-r100.ebuild
index cb184ff3fe86..40ab20831e94 100644
--- a/dev-lang/rust/rust-1.75.0-r100.ebuild
+++ b/dev-lang/rust/rust-1.75.0-r100.ebuild
@@ -202,11 +202,6 @@ pkg_setup() {
export LIBGIT2_NO_PKG_CONFIG=1 #749381
if tc-is-cross-compiler; then
- export PKG_CONFIG_ALLOW_CROSS=1
- export PKG_CONFIG_PATH="${ROOT}/usr/$(get_libdir)/pkgconfig"
- export OPENSSL_INCLUDE_DIR="${ROOT}/usr/include"
- export OPENSSL_LIB_DIR="${ROOT}/usr/$(get_libdir)"
-
use system-llvm && die "USE=system-llvm not allowed when
cross-compiling"
local cross_llvm_target="$(llvm_tuple_to_target "${CBUILD}")"
use "llvm_targets_${cross_llvm_target}" || \
@@ -225,6 +220,13 @@ pkg_setup() {
}
src_configure() {
+ if tc-is-cross-compiler; then
+ export PKG_CONFIG_ALLOW_CROSS=1
+ export PKG_CONFIG_PATH="${ESYSROOT}/usr/$(get_libdir)/pkgconfig"
+ export OPENSSL_INCLUDE_DIR="${ESYSROOT}/usr/include"
+ export OPENSSL_LIB_DIR="${ESYSROOT}/usr/$(get_libdir)"
+ fi
+
filter-lto # https://bugs.gentoo.org/862109
https://bugs.gentoo.org/866231
local rust_target="" rust_targets="" arch_cflags
diff --git a/dev-lang/rust/rust-1.77.1-r100.ebuild
b/dev-lang/rust/rust-1.77.1-r100.ebuild
index 7d5dad178050..372322af3e8f 100644
--- a/dev-lang/rust/rust-1.77.1-r100.ebuild
+++ b/dev-lang/rust/rust-1.77.1-r100.ebuild
@@ -200,11 +200,6 @@ pkg_setup() {
export LIBGIT2_NO_PKG_CONFIG=1 #749381
if tc-is-cross-compiler; then
- export PKG_CONFIG_ALLOW_CROSS=1
- export PKG_CONFIG_PATH="${ROOT}/usr/$(get_libdir)/pkgconfig"
- export OPENSSL_INCLUDE_DIR="${ROOT}/usr/include"
- export OPENSSL_LIB_DIR="${ROOT}/usr/$(get_libdir)"
-
use system-llvm && die "USE=system-llvm not allowed when
cross-compiling"
local cross_llvm_target="$(llvm_tuple_to_target "${CBUILD}")"
use "llvm_targets_${cross_llvm_target}" || \
@@ -223,6 +218,13 @@ pkg_setup() {
}
src_configure() {
+ if tc-is-cross-compiler; then
+ export PKG_CONFIG_ALLOW_CROSS=1
+ export PKG_CONFIG_PATH="${ESYSROOT}/usr/$(get_libdir)/pkgconfig"
+ export OPENSSL_INCLUDE_DIR="${ESYSROOT}/usr/include"
+ export OPENSSL_LIB_DIR="${ESYSROOT}/usr/$(get_libdir)"
+ fi
+
filter-lto # https://bugs.gentoo.org/862109
https://bugs.gentoo.org/866231
local rust_target="" rust_targets="" arch_cflags
diff --git a/dev-lang/rust/rust-1.79.0-r100.ebuild
b/dev-lang/rust/rust-1.79.0-r100.ebuild
index 0453475c9add..e1878c76dba4 100644
--- a/dev-lang/rust/rust-1.79.0-r100.ebuild
+++ b/dev-lang/rust/rust-1.79.0-r100.ebuild
@@ -200,11 +200,6 @@ pkg_setup() {
export LIBGIT2_NO_PKG_CONFIG=1 #749381
if tc-is-cross-compiler; then
- export PKG_CONFIG_ALLOW_CROSS=1
- export PKG_CONFIG_PATH="${ROOT}/usr/$(get_libdir)/pkgconfig"
- export OPENSSL_INCLUDE_DIR="${ROOT}/usr/include"
- export OPENSSL_LIB_DIR="${ROOT}/usr/$(get_libdir)"
-
use system-llvm && die "USE=system-llvm not allowed when
cross-compiling"
local cross_llvm_target="$(llvm_tuple_to_target "${CBUILD}")"
use "llvm_targets_${cross_llvm_target}" || \
@@ -223,6 +218,13 @@ pkg_setup() {
}
src_configure() {
+ if tc-is-cross-compiler; then
+ export PKG_CONFIG_ALLOW_CROSS=1
+ export PKG_CONFIG_PATH="${ESYSROOT}/usr/$(get_libdir)/pkgconfig"
+ export OPENSSL_INCLUDE_DIR="${ESYSROOT}/usr/include"
+ export OPENSSL_LIB_DIR="${ESYSROOT}/usr/$(get_libdir)"
+ fi
+
filter-lto # https://bugs.gentoo.org/862109
https://bugs.gentoo.org/866231
local rust_target="" rust_targets="" arch_cflags
diff --git a/dev-lang/rust/rust-1.80.1-r100.ebuild
b/dev-lang/rust/rust-1.80.1-r100.ebuild
index 6ca29dc16db2..9dbccd98b9a6 100644
--- a/dev-lang/rust/rust-1.80.1-r100.ebuild
+++ b/dev-lang/rust/rust-1.80.1-r100.ebuild
@@ -199,11 +199,6 @@ pkg_setup() {
export LIBGIT2_NO_PKG_CONFIG=1 #749381
if tc-is-cross-compiler; then
- export PKG_CONFIG_ALLOW_CROSS=1
- export PKG_CONFIG_PATH="${ROOT}/usr/$(get_libdir)/pkgconfig"
- export OPENSSL_INCLUDE_DIR="${ROOT}/usr/include"
- export OPENSSL_LIB_DIR="${ROOT}/usr/$(get_libdir)"
-
use system-llvm && die "USE=system-llvm not allowed when
cross-compiling"
local cross_llvm_target="$(llvm_tuple_to_target "${CBUILD}")"
use "llvm_targets_${cross_llvm_target}" || \
@@ -222,6 +217,13 @@ pkg_setup() {
}
src_configure() {
+ if tc-is-cross-compiler; then
+ export PKG_CONFIG_ALLOW_CROSS=1
+ export PKG_CONFIG_PATH="${ESYSROOT}/usr/$(get_libdir)/pkgconfig"
+ export OPENSSL_INCLUDE_DIR="${ESYSROOT}/usr/include"
+ export OPENSSL_LIB_DIR="${ESYSROOT}/usr/$(get_libdir)"
+ fi
+
filter-lto # https://bugs.gentoo.org/862109
https://bugs.gentoo.org/866231
local rust_target="" rust_targets="" arch_cflags
diff --git a/dev-lang/rust/rust-1.81.0-r100.ebuild
b/dev-lang/rust/rust-1.81.0-r100.ebuild
index fd51c0508930..8d7100d336d7 100644
--- a/dev-lang/rust/rust-1.81.0-r100.ebuild
+++ b/dev-lang/rust/rust-1.81.0-r100.ebuild
@@ -203,11 +203,6 @@ pkg_setup() {
export LIBGIT2_NO_PKG_CONFIG=1 #749381
if tc-is-cross-compiler; then
- export PKG_CONFIG_ALLOW_CROSS=1
- export PKG_CONFIG_PATH="${ROOT}/usr/$(get_libdir)/pkgconfig"
- export OPENSSL_INCLUDE_DIR="${ROOT}/usr/include"
- export OPENSSL_LIB_DIR="${ROOT}/usr/$(get_libdir)"
-
use system-llvm && die "USE=system-llvm not allowed when
cross-compiling"
local cross_llvm_target="$(llvm_tuple_to_target "${CBUILD}")"
use "llvm_targets_${cross_llvm_target}" || \
@@ -226,6 +221,13 @@ pkg_setup() {
}
src_configure() {
+ if tc-is-cross-compiler; then
+ export PKG_CONFIG_ALLOW_CROSS=1
+ export PKG_CONFIG_PATH="${ESYSROOT}/usr/$(get_libdir)/pkgconfig"
+ export OPENSSL_INCLUDE_DIR="${ESYSROOT}/usr/include"
+ export OPENSSL_LIB_DIR="${ESYSROOT}/usr/$(get_libdir)"
+ fi
+
filter-lto # https://bugs.gentoo.org/862109
https://bugs.gentoo.org/866231
local rust_target="" rust_targets="" arch_cflags
diff --git a/dev-lang/rust/rust-1.82.0-r100.ebuild
b/dev-lang/rust/rust-1.82.0-r100.ebuild
index a9d301b6a502..81cd016d3611 100644
--- a/dev-lang/rust/rust-1.82.0-r100.ebuild
+++ b/dev-lang/rust/rust-1.82.0-r100.ebuild
@@ -199,11 +199,6 @@ pkg_setup() {
export LIBGIT2_NO_PKG_CONFIG=1 #749381
if tc-is-cross-compiler; then
- export PKG_CONFIG_ALLOW_CROSS=1
- export PKG_CONFIG_PATH="${ROOT}/usr/$(get_libdir)/pkgconfig"
- export OPENSSL_INCLUDE_DIR="${ROOT}/usr/include"
- export OPENSSL_LIB_DIR="${ROOT}/usr/$(get_libdir)"
-
use system-llvm && die "USE=system-llvm not allowed when
cross-compiling"
local cross_llvm_target="$(llvm_tuple_to_target "${CBUILD}")"
use "llvm_targets_${cross_llvm_target}" || \
@@ -234,6 +229,13 @@ src_prepare() {
}
src_configure() {
+ if tc-is-cross-compiler; then
+ export PKG_CONFIG_ALLOW_CROSS=1
+ export PKG_CONFIG_PATH="${ESYSROOT}/usr/$(get_libdir)/pkgconfig"
+ export OPENSSL_INCLUDE_DIR="${ESYSROOT}/usr/include"
+ export OPENSSL_LIB_DIR="${ESYSROOT}/usr/$(get_libdir)"
+ fi
+
filter-lto # https://bugs.gentoo.org/862109
https://bugs.gentoo.org/866231
local rust_target="" rust_targets="" arch_cflags
