commit: 1952cab7d0fc2dd12dd7d2b274398ccb019c2438
Author: orbea <orbea <AT> riseup <DOT> net>
AuthorDate: Sat Nov 23 22:49:37 2024 +0000
Commit: orbea <orbea <AT> riseup <DOT> net>
CommitDate: Sat Nov 23 22:49:37 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=1952cab7
dev-lang/rust: sync ::gentoo
Signed-off-by: orbea <orbea <AT> riseup.net>
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 | 13 +++++++------
7 files changed, 49 insertions(+), 36 deletions(-)
diff --git a/dev-lang/rust/rust-1.74.1-r100.ebuild
b/dev-lang/rust/rust-1.74.1-r100.ebuild
index 75c2e32..5e2a4e0 100644
--- a/dev-lang/rust/rust-1.74.1-r100.ebuild
+++ b/dev-lang/rust/rust-1.74.1-r100.ebuild
@@ -207,11 +207,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}" || \
@@ -235,6 +230,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
diff --git a/dev-lang/rust/rust-1.75.0-r100.ebuild
b/dev-lang/rust/rust-1.75.0-r100.ebuild
index 3038ad0..f793cfa 100644
--- a/dev-lang/rust/rust-1.75.0-r100.ebuild
+++ b/dev-lang/rust/rust-1.75.0-r100.ebuild
@@ -209,11 +209,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}" || \
@@ -237,6 +232,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
diff --git a/dev-lang/rust/rust-1.77.1-r100.ebuild
b/dev-lang/rust/rust-1.77.1-r100.ebuild
index 8ecdb24..269493b 100644
--- a/dev-lang/rust/rust-1.77.1-r100.ebuild
+++ b/dev-lang/rust/rust-1.77.1-r100.ebuild
@@ -207,11 +207,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}" || \
@@ -236,6 +231,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
diff --git a/dev-lang/rust/rust-1.79.0-r100.ebuild
b/dev-lang/rust/rust-1.79.0-r100.ebuild
index 80369af..243266f 100644
--- a/dev-lang/rust/rust-1.79.0-r100.ebuild
+++ b/dev-lang/rust/rust-1.79.0-r100.ebuild
@@ -207,11 +207,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}" || \
@@ -236,6 +231,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
diff --git a/dev-lang/rust/rust-1.80.1-r100.ebuild
b/dev-lang/rust/rust-1.80.1-r100.ebuild
index ceaa87c..061eb7d 100644
--- a/dev-lang/rust/rust-1.80.1-r100.ebuild
+++ b/dev-lang/rust/rust-1.80.1-r100.ebuild
@@ -206,11 +206,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}" || \
@@ -235,6 +230,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
diff --git a/dev-lang/rust/rust-1.81.0-r100.ebuild
b/dev-lang/rust/rust-1.81.0-r100.ebuild
index da785b2..19d6557 100644
--- a/dev-lang/rust/rust-1.81.0-r100.ebuild
+++ b/dev-lang/rust/rust-1.81.0-r100.ebuild
@@ -210,11 +210,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}" || \
@@ -239,6 +234,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
diff --git a/dev-lang/rust/rust-1.82.0-r100.ebuild
b/dev-lang/rust/rust-1.82.0-r100.ebuild
index a14e5d1..f8cae41 100644
--- a/dev-lang/rust/rust-1.82.0-r100.ebuild
+++ b/dev-lang/rust/rust-1.82.0-r100.ebuild
@@ -135,7 +135,6 @@ PATCHES=(
"${FILESDIR}"/1.74.1-cross-compile-libz.patch
#"${FILESDIR}"/1.72.0-bump-libc-deps-to-0.2.146.patch # pending refresh
"${FILESDIR}"/1.67.0-doc-wasm.patch
- "${FILESDIR}"/1.79.0-revert-8c40426.patch
)
clear_vendor_checksums() {
@@ -206,11 +205,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}" || \
@@ -244,6 +238,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
