gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-08-25 07:08:13 -07:00
Code Issues Projects Releases Wiki Activity

dev-debug/gdb: fix/cleanup Solaris fixes

Browse Source 
Don't run kernel-is on Solaris/macOS for it dies.  Cleanup Solaris c++
compiler hack, it's fixed upstream.

Signed-off-by: Fabian Groffen <grobian@gentoo.org>
This commit is contained in:
Fabian Groffen
2025-04-17 21:35:01 +02:00
parent 64d3315710
commit ba8a496736
2 changed files with 20 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
dev-debug/gdb/gdb-16.2-r2.ebuild
View File

@@ -134,14 +134,16 @@ PATCHES=(
pkg_setup() {
local CONFIG_CHECK
if kernel_is -ge 6.11.3 ; then
# https://forums.gentoo.org/viewtopic-p-8846891.html
#
# Either CONFIG_PROC_MEM_ALWAYS_FORCE or CONFIG_PROC_MEM_FORCE_PTRACE
# should be okay, but not CONFIG_PROC_MEM_NO_FORCE.
CONFIG_CHECK+="
~!PROC_MEM_NO_FORCE
"
if [[ ${CHOST} == *-linux-* ]] ; then
if kernel_is -ge 6.11.3 ; then
# https://forums.gentoo.org/viewtopic-p-8846891.html
#
# Either CONFIG_PROC_MEM_ALWAYS_FORCE or CONFIG_PROC_MEM_FORCE_PTRACE
# should be okay, but not CONFIG_PROC_MEM_NO_FORCE.
CONFIG_CHECK+="
~!PROC_MEM_NO_FORCE
"
fi
fi
linux-info_pkg_setup
@@ -160,14 +162,6 @@ src_prepare() {
# Avoid using ancient termcap from host on Prefix systems
sed -i -e 's/termcap tinfow/tinfow/g' \
gdb/configure{.ac,} || die
if [[ ${CHOST} == *-solaris* ]] ; then
# code relies on C++11, so make sure we get that selected
# due to Python 3.11 pymacro.h doing stuff to work around
# versioning mess based on the C version, while we're compiling
# C++ here, so we need to make it clear we're doing C++11/C11
# because Solaris system headers act on these
sed -i -e 's/-x c++/-std=c++11/' gdb/Makefile.in || die
fi
}
gdb_branding() {

26
dev-debug/gdb/gdb-9999.ebuild
View File

@@ -134,14 +134,16 @@ PATCHES=(
pkg_setup() {
local CONFIG_CHECK
if kernel_is -ge 6.11.3 ; then
# https://forums.gentoo.org/viewtopic-p-8846891.html
#
# Either CONFIG_PROC_MEM_ALWAYS_FORCE or CONFIG_PROC_MEM_FORCE_PTRACE
# should be okay, but not CONFIG_PROC_MEM_NO_FORCE.
CONFIG_CHECK+="
~!PROC_MEM_NO_FORCE
"
if [[ ${CHOST} == *-linux-* ]] ; then
if kernel_is -ge 6.11.3 ; then
# https://forums.gentoo.org/viewtopic-p-8846891.html
#
# Either CONFIG_PROC_MEM_ALWAYS_FORCE or CONFIG_PROC_MEM_FORCE_PTRACE
# should be okay, but not CONFIG_PROC_MEM_NO_FORCE.
CONFIG_CHECK+="
~!PROC_MEM_NO_FORCE
"
fi
fi
linux-info_pkg_setup
@@ -160,14 +162,6 @@ src_prepare() {
# Avoid using ancient termcap from host on Prefix systems
sed -i -e 's/termcap tinfow/tinfow/g' \
gdb/configure{.ac,} || die
if [[ ${CHOST} == *-solaris* ]] ; then
# code relies on C++11, so make sure we get that selected
# due to Python 3.11 pymacro.h doing stuff to work around
# versioning mess based on the C version, while we're compiling
# C++ here, so we need to make it clear we're doing C++11/C11
# because Solaris system headers act on these
sed -i -e 's/-x c++/-std=c++11/' gdb/Makefile.in || die
fi
}
gdb_branding() {