gentoo auto-resync : 04:03:2023 - 07:37:01

3 files changed, 24 insertions, 26 deletions

diff --git a/sys-devel/gdb/Manifest b/sys-devel/gdb/Manifest
index c0f8701d0c03..de711c43bcc7 100644
--- a/sys-devel/gdb/Manifest
+++ b/sys-devel/gdb/Manifest
@@ -7,6 +7,6 @@ DIST gdb-12.1.tar.xz 22470332 BLAKE2B 7f6f853d1640908cf2c79932cdc1ba02549a07721c
 DIST gdb-13.1.tar.xz 23665472 BLAKE2B ab3a77ef35d21597dd1299787eebc422c3ca9764d0866223752c3036c0f9e198bf25ab4730bf6e7025bc2db148c66e98b191e15abc2d69c3088aed146728beef SHA512 e65054ffbc0357eeed4b17e1edc5ef45aa73c9ddf3b1210651e3d859576e27c1d27b266800fe26328eda58857455ccd8632f4000cfc5f63f90854096290187ca
 EBUILD gdb-12.1-r3.ebuild 8100 BLAKE2B 48a993f5a5319bb9326a1f045b4b4ca2706011f77a4c1ef96c135bff3aacf3a7b2e20862645f443f7558c405ea1864e2d8251407a5e208fce6817e0079c6cc50 SHA512 9519decae94744ffa27371879b222f21be38036b8b5642be4a37fc5d2930e2f92ede7373b0e56f66208d57a6d36b94762e9395cd42e89c55bfedc90f05bf0e98
 EBUILD gdb-12.1-r4.ebuild 8352 BLAKE2B b70813155233f843c45cc853b4b1d5d14d9abc861fd9d244c67b14fe6e708cbc452fdc0064f8e0183c247c0c62ffb9e1390f843ad0b7344c75a177570a8fb4b5 SHA512 1d407f528c52b3b7930df48658d9c956fd7ff1416cb9e8ca01325febf689b69fbcffaa60fb55245a3e98de46c55a5390a5d63d3748be8da0b39a83a5519a42f6
-EBUILD gdb-13.1.ebuild 8578 BLAKE2B a6880f78003e1b75dd9877bd3da2828e62409614b5ffb544105465dfa9e9a049a4a9abfab9584b1b4a7fcf1f7c54d57fe13018548b7f9a5477f64a5ed502359b SHA512 b3728e18a6753fd8549e6e70e9aeffe352959b16ab9308f79f875cb9cb75c13503794bc4602dbc65c06965f0c6132ba504a85d58ce619632eafa841d98941f0f
-EBUILD gdb-9999.ebuild 8578 BLAKE2B a6880f78003e1b75dd9877bd3da2828e62409614b5ffb544105465dfa9e9a049a4a9abfab9584b1b4a7fcf1f7c54d57fe13018548b7f9a5477f64a5ed502359b SHA512 b3728e18a6753fd8549e6e70e9aeffe352959b16ab9308f79f875cb9cb75c13503794bc4602dbc65c06965f0c6132ba504a85d58ce619632eafa841d98941f0f
+EBUILD gdb-13.1-r1.ebuild 8519 BLAKE2B f5ef2bff55dbee67a71100bb1e8bab0bb74698bbec93a5f12e65ed99ab4b6942e3b0ebef8488d35d8c410bea8cd083013ce0e9045590b37dafe0d9a5665d42f0 SHA512 bc9f0b32eb91be3983f896a2bc6266cf3168d4b47b1c492f80abca4b5fa44c13363f49e85e8f420ee41977e8c16f0d5aea238bd1553c540df5e2325ad6ba4bee
+EBUILD gdb-9999.ebuild 8519 BLAKE2B f5ef2bff55dbee67a71100bb1e8bab0bb74698bbec93a5f12e65ed99ab4b6942e3b0ebef8488d35d8c410bea8cd083013ce0e9045590b37dafe0d9a5665d42f0 SHA512 bc9f0b32eb91be3983f896a2bc6266cf3168d4b47b1c492f80abca4b5fa44c13363f49e85e8f420ee41977e8c16f0d5aea238bd1553c540df5e2325ad6ba4bee
 MISC metadata.xml 1242 BLAKE2B 368d8798d7d3b610653f635eb36ee5517912e8a2cb392622b32ac0aa90f336e3b391ba25811dee110644e50fabec0d64f6bcf3b219cdd240ec806e709a198eed SHA512 192fa340899680413c3d6c886ecd7d2262475a33aecc452192e5fe1d8e3eb5cf17546e57181e720128cf9b39cd8e4b1b1a73cb1f0c9887866c0ce88b288636e2
diff --git a/sys-devel/gdb/gdb-13.1.ebuild b/sys-devel/gdb/gdb-13.1-r1.ebuild
index d356d5e3ecab..bc86849c6276 100644
--- a/sys-devel/gdb/gdb-13.1.ebuild
+++ b/sys-devel/gdb/gdb-13.1-r1.ebuild
@@ -160,21 +160,13 @@ src_configure() {
 		# But the check does not quite work on i686: bug #760926.
 		$(use_enable cet)
 
-		# We need to set both configure options, --with-sysroot and --libdir,
-		# to fix cross build issues that happen when configuring gmp.
-		# We explicitly need --libdir. Having only --with-sysroot without
-		# --libdir would not fix the build issues.
-		# For some reason, it is not enough to set only --with-sysroot,
-		# also not enough to pass --with-gmp-xxx options.
-		--with-sysroot="${ESYSROOT}"
-		--libdir="${ESYSROOT}/usr/$(get_libdir)"
+		# Helps when cross-compiling. Not to be confused with --with-sysroot.
+		--with-build-sysroot="${ESYSROOT}"
 	)
 
-	local sysroot="${EPREFIX}/usr/${CTARGET}"
-
 	is_cross && myconf+=(
-		--with-sysroot="${sysroot}"
-		--includedir="${sysroot}/usr/include"
+		--with-sysroot="\${prefix}/${CTARGET}"
+		--includedir="\${prefix}/include/${CTARGET}"
 		--with-gdb-datadir="\${datadir}/gdb/${CTARGET}"
 	)
 
@@ -211,6 +203,13 @@ src_configure() {
 		$(use_with xxhash)
 		$(use_with guile)
 		$(use_with zstd)
+
+		# Find libraries using the toolchain sysroot rather than the configured
+		# prefix. Needed when cross-compiling.
+		#
+		# Check which libraries to apply this to with:
+		# "${S}"/gdb/configure --help | grep without-lib | sort
+		--without-lib{babeltrace,expat,gmp,iconv,ipt,lzma,mpfr,xxhash}-prefix
 	)
 
 	if use sparc-solaris || use x86-solaris ; then
diff --git a/sys-devel/gdb/gdb-9999.ebuild b/sys-devel/gdb/gdb-9999.ebuild
index d356d5e3ecab..bc86849c6276 100644
--- a/sys-devel/gdb/gdb-9999.ebuild
+++ b/sys-devel/gdb/gdb-9999.ebuild
@@ -160,21 +160,13 @@ src_configure() {
 		# But the check does not quite work on i686: bug #760926.
 		$(use_enable cet)
 
-		# We need to set both configure options, --with-sysroot and --libdir,
-		# to fix cross build issues that happen when configuring gmp.
-		# We explicitly need --libdir. Having only --with-sysroot without
-		# --libdir would not fix the build issues.
-		# For some reason, it is not enough to set only --with-sysroot,
-		# also not enough to pass --with-gmp-xxx options.
-		--with-sysroot="${ESYSROOT}"
-		--libdir="${ESYSROOT}/usr/$(get_libdir)"
+		# Helps when cross-compiling. Not to be confused with --with-sysroot.
+		--with-build-sysroot="${ESYSROOT}"
 	)
 
-	local sysroot="${EPREFIX}/usr/${CTARGET}"
-
 	is_cross && myconf+=(
-		--with-sysroot="${sysroot}"
-		--includedir="${sysroot}/usr/include"
+		--with-sysroot="\${prefix}/${CTARGET}"
+		--includedir="\${prefix}/include/${CTARGET}"
 		--with-gdb-datadir="\${datadir}/gdb/${CTARGET}"
 	)
 
@@ -211,6 +203,13 @@ src_configure() {
 		$(use_with xxhash)
 		$(use_with guile)
 		$(use_with zstd)
+
+		# Find libraries using the toolchain sysroot rather than the configured
+		# prefix. Needed when cross-compiling.
+		#
+		# Check which libraries to apply this to with:
+		# "${S}"/gdb/configure --help | grep without-lib | sort
+		--without-lib{babeltrace,expat,gmp,iconv,ipt,lzma,mpfr,xxhash}-prefix
 	)
 
 	if use sparc-solaris || use x86-solaris ; then