diff options
Diffstat (limited to 'sys-devel/gdb')
-rw-r--r-- | sys-devel/gdb/Manifest | 6 | ||||
-rw-r--r-- | sys-devel/gdb/gdb-10.1.ebuild | 115 | ||||
-rw-r--r-- | sys-devel/gdb/gdb-9999.ebuild | 115 | ||||
-rw-r--r-- | sys-devel/gdb/metadata.xml | 1 |
4 files changed, 97 insertions, 140 deletions
diff --git a/sys-devel/gdb/Manifest b/sys-devel/gdb/Manifest index 00ae828167ae..68fe9a4f6953 100644 --- a/sys-devel/gdb/Manifest +++ b/sys-devel/gdb/Manifest @@ -1,5 +1,5 @@ AUX gdb-8.3.1-verbose-build.patch 395 BLAKE2B e2e82307ceae64d16aa9b57a5e639eb5d217c4d977aed0847fdf125bb13ebc004906d9afb8e3f629c41efccca88df0040015e7799c1fd24de5fb50f62f5bbd90 SHA512 c2bb013e4fcabefddcd8042bd3cbb53471f83182cc8769fe0d19eed80ccc4a83bd84d120006fa25b3b7d0310dc2f2ec6b44a6ff74909cd312b7e491f371777a3 DIST gdb-10.1.tar.xz 21507112 BLAKE2B 69d79cd667ecb6e936b41a03817ade5dd9b761f97bc123d668b5f968d123c37d048fc8ec1289151e989f01bb01a43cc3d8b5b54f1807f1e3eb5f43e6bf0aa55b SHA512 0dc54380435c6853db60f1e388b94836d294dfa9ad7f518385a27db4edd03cb970f8717d5f1e9c9a0d4a33d7fcf91bc2e5d6c9cf9e4b561dcc74e65b806c1537 -EBUILD gdb-10.1.ebuild 7467 BLAKE2B d380247d229b8c6ca3a1d623e0e59116df58a3fc254231b735653a1fc7b614948c0b1e74a46c459f07d16fef3a5b37bbdcce3abf1c276d5b76b01f7e42ab3cf0 SHA512 31e11601a9dba5077b9d6705c29a9c02989f3358664dd6f0cba9df3c8b0466473dca3d69abd736094b7b863ee5cf8f3921c07ab48d4ced46cdddc3f9cb9c810d -EBUILD gdb-9999.ebuild 7475 BLAKE2B 23785ad23261b53c59329d8576298e767080b7429ee61cc4313c1514b742db97c273cd4dad25034f67638b29da0527fb6a9d0adc000f47514125cd27dbd4c965 SHA512 1ae91ea9bb84e4705d2095f0a2cfa55ac011f01295576da0da6a6e05a0aa7e3973e7fe9e97c9d8f67c82d915da32abcd81ae6814d226b0d9ab5f000a81d3fac0 -MISC metadata.xml 1185 BLAKE2B 524a340429b56430dcebf53fb141336f5c7b785865a9b2f407c548a79b0babb60b7771687a41a048d2877ced1d81ce2ab0e602bc8745abe01cce4d3baff48ea7 SHA512 cbd91ca72a0284fdb5b848af05f05f7e6895f68a35ecabe841c0b3d32aade02cc46f2bcc13c6a6a991097500487666410fff51959b38e278e1adc21d5691b01f +EBUILD gdb-10.1.ebuild 6938 BLAKE2B 66cc171af7c1f3e498437ab91eae73471ac65a9dc8916327e2a82b524895d070c7f9c3336296c6daf0ea7545bd4343450ba24497b32a741c508aa042c17ffc78 SHA512 ec07817e0c4483bf5341af718febbc0a1f65495d5a44345ae74d4a1b20a43734af42d20821ff1cac99dba9da026b39c041aea91cb1263768a118cbbf4b8a79b8 +EBUILD gdb-9999.ebuild 6946 BLAKE2B fd0befee5a30362660cacd8ad6e720a696117e6227d188faf783fe917fc69cdedaeb1dab1afd8bf89648b382b5fac875d112a2504624a24b92021d73cd812eb0 SHA512 e8196cb19cb137b92995165b5f0755c0071ac0bfeaca2be48bc718c806bb9f27796620943c4ecef1352601d42db072386e025da9f67daf194a85bf30a30a14c4 +MISC metadata.xml 1102 BLAKE2B 76a586ca542d54f382f13416d53729e9a26f05d8ee2e592cf0b0aa1851d0a9546b20d2058107ca250986682c5f4f86c38939f4cd627f36d9223be3589337caad SHA512 047a745a15e2fd6ecbf22d52e3771e0982a10ed2eb41513e30946574e5b6e813088a31bb3c32832181f19fbd4f5061575389723f66b1821e75839a863e422c0e diff --git a/sys-devel/gdb/gdb-10.1.ebuild b/sys-devel/gdb/gdb-10.1.ebuild index 940b142caef1..68826d3db64c 100644 --- a/sys-devel/gdb/gdb-10.1.ebuild +++ b/sys-devel/gdb/gdb-10.1.ebuild @@ -46,10 +46,9 @@ SLOT="0" if [[ ${PV} != 9999* ]] ; then KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi -IUSE="cet +client lzma multitarget nls +python +server source-highlight test vanilla xml xxhash" +IUSE="cet lzma multitarget nls +python +server source-highlight test vanilla xml xxhash" REQUIRED_USE=" python? ( ${PYTHON_REQUIRED_USE} ) - || ( client server ) " # ia64 kernel crashes when gdb testsuite is running @@ -60,15 +59,13 @@ RESTRICT=" " RDEPEND=" - client? ( - dev-libs/mpfr:0= - >=sys-libs/ncurses-5.2-r2:0= - >=sys-libs/readline-7:0= - lzma? ( app-arch/xz-utils ) - python? ( ${PYTHON_DEPS} ) - xml? ( dev-libs/expat ) - sys-libs/zlib - ) + dev-libs/mpfr:0= + >=sys-libs/ncurses-5.2-r2:0= + >=sys-libs/readline-7:0= + sys-libs/zlib + lzma? ( app-arch/xz-utils ) + python? ( ${PYTHON_DEPS} ) + xml? ( dev-libs/expat ) source-highlight? ( dev-util/source-highlight ) @@ -80,11 +77,10 @@ DEPEND="${RDEPEND}" BDEPEND=" app-arch/xz-utils sys-apps/texinfo - client? ( - virtual/yacc - test? ( dev-util/dejagnu ) - nls? ( sys-devel/gettext ) - )" + virtual/yacc + nls? ( sys-devel/gettext ) + test? ( dev-util/dejagnu ) +" PATCHES=( "${FILESDIR}"/${PN}-8.3.1-verbose-build.patch @@ -146,49 +142,39 @@ src_configure() { --with-gdb-datadir="\${datadir}/gdb/${CTARGET}" ) - if use server && ! use client ; then - # just configure+build in the gdbserver subdir to speed things up - cd gdbserver - myconf+=( --program-transform-name='' ) - else - # gdbserver only works for native targets (CHOST==CTARGET). - # it also doesn't support all targets, so rather than duplicate - # the target list (which changes between versions), use the - # "auto" value when things are turned on, which is triggered - # whenever no --enable or --disable is given - if is_cross || use !server ; then - myconf+=( --disable-gdbserver ) - fi + # gdbserver only works for native targets (CHOST==CTARGET). + # it also doesn't support all targets, so rather than duplicate + # the target list (which changes between versions), use the + # "auto" value when things are turned on, which is triggered + # whenever no --enable or --disable is given + if is_cross || use !server ; then + myconf+=( --disable-gdbserver ) fi - if ! ( use server && ! use client ) ; then - # if we are configuring in the top level, then use all - # the additional global options - myconf+=( - --enable-64-bit-bfd - --disable-install-libbfd - --disable-install-libiberty - # Disable guile for now as it requires guile-2.x #562902 - --without-guile - --enable-obsolete - # This only disables building in the readline subdir. - # For gdb itself, it'll use the system version. - --disable-readline - --with-system-readline - # This only disables building in the zlib subdir. - # For gdb itself, it'll use the system version. - --without-zlib - --with-system-zlib - --with-separate-debug-dir="${EPREFIX}"/usr/lib/debug - $(use_with xml expat) - $(use_with lzma) - $(use_enable nls) - $(use_enable source-highlight) - $(use multitarget && echo --enable-targets=all) - $(use_with python python "${EPYTHON}") - $(use_with xxhash) - ) - fi + myconf+=( + --enable-64-bit-bfd + --disable-install-libbfd + --disable-install-libiberty + # Disable guile for now as it requires guile-2.x #562902 + --without-guile + --enable-obsolete + # This only disables building in the readline subdir. + # For gdb itself, it'll use the system version. + --disable-readline + --with-system-readline + # This only disables building in the zlib subdir. + # For gdb itself, it'll use the system version. + --without-zlib + --with-system-zlib + --with-separate-debug-dir="${EPREFIX}"/usr/lib/debug + $(use_with xml expat) + $(use_with lzma) + $(use_enable nls) + $(use_enable source-highlight) + $(use multitarget && echo --enable-targets=all) + $(use_with python python "${EPYTHON}") + $(use_with xxhash) + ) if use sparc-solaris || use x86-solaris ; then # disable largefile support # https://sourceware.org/ml/gdb-patches/2014-12/msg00058.html @@ -202,13 +188,8 @@ src_configure() { } src_install() { - if use server && ! use client; then - cd gdbserver || die - fi default - if use client; then - find "${ED}"/usr -name libiberty.a -delete || die - fi + find "${ED}"/usr -name libiberty.a -delete || die # Delete translations that conflict with binutils-libs. #528088 # Note: Should figure out how to store these in an internal gdb dir. @@ -235,11 +216,9 @@ src_install() { # notes in src_configure above). [[ -e gdbserver/gdbreplay ]] && dobin gdbserver/gdbreplay - if use client ; then - docinto gdb - dodoc gdb/CONTRIBUTE gdb/README gdb/MAINTAINERS \ - gdb/NEWS gdb/ChangeLog gdb/PROBLEMS - fi + docinto gdb + dodoc gdb/CONTRIBUTE gdb/README gdb/MAINTAINERS \ + gdb/NEWS gdb/ChangeLog gdb/PROBLEMS docinto sim dodoc sim/{ChangeLog,MAINTAINERS,README-HACKING} if use server ; then diff --git a/sys-devel/gdb/gdb-9999.ebuild b/sys-devel/gdb/gdb-9999.ebuild index bcbe6b1cd2a8..ceab3a731e88 100644 --- a/sys-devel/gdb/gdb-9999.ebuild +++ b/sys-devel/gdb/gdb-9999.ebuild @@ -46,10 +46,9 @@ SLOT="0" if [[ ${PV} != 9999* ]] ; then KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi -IUSE="cet +client lzma multitarget nls +python +server source-highlight test vanilla xml xxhash" +IUSE="cet lzma multitarget nls +python +server source-highlight test vanilla xml xxhash" REQUIRED_USE=" python? ( ${PYTHON_REQUIRED_USE} ) - || ( client server ) " # ia64 kernel crashes when gdb testsuite is running @@ -60,15 +59,13 @@ RESTRICT=" " RDEPEND=" - client? ( - dev-libs/mpfr:0= - >=sys-libs/ncurses-5.2-r2:0= - >=sys-libs/readline-7:0= - lzma? ( app-arch/xz-utils ) - python? ( ${PYTHON_DEPS} ) - xml? ( dev-libs/expat ) - sys-libs/zlib - ) + dev-libs/mpfr:0= + >=sys-libs/ncurses-5.2-r2:0= + >=sys-libs/readline-7:0= + sys-libs/zlib + lzma? ( app-arch/xz-utils ) + python? ( ${PYTHON_DEPS} ) + xml? ( dev-libs/expat ) source-highlight? ( dev-util/source-highlight ) @@ -80,11 +77,10 @@ DEPEND="${RDEPEND}" BDEPEND=" app-arch/xz-utils sys-apps/texinfo - client? ( - virtual/yacc - test? ( dev-util/dejagnu ) - nls? ( sys-devel/gettext ) - )" + virtual/yacc + nls? ( sys-devel/gettext ) + test? ( dev-util/dejagnu ) +" PATCHES=( "${FILESDIR}"/${PN}-8.3.1-verbose-build.patch @@ -146,49 +142,39 @@ src_configure() { --with-gdb-datadir="\${datadir}/gdb/${CTARGET}" ) - if use server && ! use client ; then - # just configure+build in the gdbserver subdir to speed things up - cd gdbserver - myconf+=( --program-transform-name='' ) - else - # gdbserver only works for native targets (CHOST==CTARGET). - # it also doesn't support all targets, so rather than duplicate - # the target list (which changes between versions), use the - # "auto" value when things are turned on, which is triggered - # whenever no --enable or --disable is given - if is_cross || use !server ; then - myconf+=( --disable-gdbserver ) - fi + # gdbserver only works for native targets (CHOST==CTARGET). + # it also doesn't support all targets, so rather than duplicate + # the target list (which changes between versions), use the + # "auto" value when things are turned on, which is triggered + # whenever no --enable or --disable is given + if is_cross || use !server ; then + myconf+=( --disable-gdbserver ) fi - if ! ( use server && ! use client ) ; then - # if we are configuring in the top level, then use all - # the additional global options - myconf+=( - --enable-64-bit-bfd - --disable-install-libbfd - --disable-install-libiberty - # Disable guile for now as it requires guile-2.x #562902 - --without-guile - --enable-obsolete - # This only disables building in the readline subdir. - # For gdb itself, it'll use the system version. - --disable-readline - --with-system-readline - # This only disables building in the zlib subdir. - # For gdb itself, it'll use the system version. - --without-zlib - --with-system-zlib - --with-separate-debug-dir="${EPREFIX}"/usr/lib/debug - $(use_with xml expat) - $(use_with lzma) - $(use_enable nls) - $(use_enable source-highlight) - $(use multitarget && echo --enable-targets=all) - $(use_with python python "${EPYTHON}") - $(use_with xxhash) - ) - fi + myconf+=( + --enable-64-bit-bfd + --disable-install-libbfd + --disable-install-libiberty + # Disable guile for now as it requires guile-2.x #562902 + --without-guile + --enable-obsolete + # This only disables building in the readline subdir. + # For gdb itself, it'll use the system version. + --disable-readline + --with-system-readline + # This only disables building in the zlib subdir. + # For gdb itself, it'll use the system version. + --without-zlib + --with-system-zlib + --with-separate-debug-dir="${EPREFIX}"/usr/lib/debug + $(use_with xml expat) + $(use_with lzma) + $(use_enable nls) + $(use_enable source-highlight) + $(use multitarget && echo --enable-targets=all) + $(use_with python python "${EPYTHON}") + $(use_with xxhash) + ) if use sparc-solaris || use x86-solaris ; then # disable largefile support # https://sourceware.org/ml/gdb-patches/2014-12/msg00058.html @@ -202,13 +188,8 @@ src_configure() { } src_install() { - if use server && ! use client; then - cd gdbserver || die - fi default - if use client; then - find "${ED}"/usr -name libiberty.a -delete || die - fi + find "${ED}"/usr -name libiberty.a -delete || die # Delete translations that conflict with binutils-libs. #528088 # Note: Should figure out how to store these in an internal gdb dir. @@ -235,11 +216,9 @@ src_install() { # notes in src_configure above). [[ -e gdbserver/gdbreplay ]] && dobin gdbserver/gdbreplay - if use client ; then - docinto gdb - dodoc gdb/CONTRIBUTE gdb/README gdb/MAINTAINERS \ - gdb/NEWS gdb/ChangeLog gdb/PROBLEMS - fi + docinto gdb + dodoc gdb/CONTRIBUTE gdb/README gdb/MAINTAINERS \ + gdb/NEWS gdb/ChangeLog gdb/PROBLEMS docinto sim dodoc sim/{ChangeLog,MAINTAINERS,README-HACKING} if use server ; then diff --git a/sys-devel/gdb/metadata.xml b/sys-devel/gdb/metadata.xml index 9595bbc9f457..36cae41ca5c8 100644 --- a/sys-devel/gdb/metadata.xml +++ b/sys-devel/gdb/metadata.xml @@ -7,7 +7,6 @@ </maintainer> <use> <flag name="cet">Enable Intel Control-flow Enforcement Technology.</flag> - <flag name="client">Install the main "gdb" program (most people want this)</flag> <flag name="lzma">Support lzma compression in ELF debug info</flag> <flag name="multitarget">Support all known targets in one gdb binary</flag> <flag name="python">Enable support for the new internal scripting language, as well as extended pretty printers</flag> |