* [gentoo-commits] gentoo-x86 commit in sys-devel/gdb: gdb-9999.ebuild ChangeLog gdb-7.3.1-r1.ebuild
@ 2012-01-02 5:42 Mike Frysinger (vapier)
0 siblings, 0 replies; 2+ messages in thread
From: Mike Frysinger (vapier) @ 2012-01-02 5:42 UTC (permalink / raw
To: gentoo-commits
vapier 12/01/02 05:42:56
Modified: gdb-9999.ebuild ChangeLog gdb-7.3.1-r1.ebuild
Log:
Merge live/non-live ebuilds, fix up USE="-client -server" behavior, and handle gdbserver better in unsupported configurations #396697 by Thomas Sachau.
(Portage version: 2.2.0_alpha81/cvs/Linux x86_64)
Revision Changes Path
1.7 sys-devel/gdb/gdb-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/gdb/gdb-9999.ebuild?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/gdb/gdb-9999.ebuild?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/gdb/gdb-9999.ebuild?r1=1.6&r2=1.7
Index: gdb-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-9999.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gdb-9999.ebuild 2 Dec 2011 21:08:12 -0000 1.6
+++ gdb-9999.ebuild 2 Jan 2012 05:42:56 -0000 1.7
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-9999.ebuild,v 1.6 2011/12/02 21:08:12 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-9999.ebuild,v 1.7 2012/01/02 05:42:56 vapier Exp $
EAPI="3"
@@ -48,15 +48,14 @@
SRC_URI="${SRC_URI} ${PATCH_VER:+mirror://gentoo/${P}-patches-${PATCH_VER}.tar.xz}"
LICENSE="GPL-2 LGPL-2"
-is_cross \
- && SLOT="${CTARGET}" \
- || SLOT="0"
+SLOT="0"
if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd ~x64-macos ~x86-macos"
+ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
-IUSE="expat multitarget nls +python test vanilla"
+IUSE="+client expat multitarget nls +python +server test vanilla"
-RDEPEND=">=sys-libs/ncurses-5.2-r2
+RDEPEND="!dev-util/gdbserver
+ >=sys-libs/ncurses-5.2-r2
sys-libs/readline
expat? ( dev-libs/expat )
python? ( =dev-lang/python-2* )"
@@ -85,18 +84,45 @@
src_configure() {
strip-unsupported-flags
- econf \
- --with-pkgversion="$(gdb_branding)" \
- --with-bugurl='http://bugs.gentoo.org/' \
- --disable-werror \
- --enable-64-bit-bfd \
- --with-system-readline \
- --with-separate-debug-dir="${EPREFIX}"/usr/lib/debug \
- $(is_cross && echo --with-sysroot="${EPREFIX}"/usr/${CTARGET}) \
- $(use_with expat) \
- $(use_enable nls) \
- $(use multitarget && echo --enable-targets=all) \
- $(use_with python python "${EPREFIX}/usr/bin/python2")
+
+ local myconf=(
+ --with-pkgversion="$(gdb_branding)"
+ --with-bugurl='http://bugs.gentoo.org/'
+ --disable-werror
+ $(is_cross && echo --with-sysroot="${EPREFIX}"/usr/${CTARGET})
+ )
+
+ if use server && ! use client ; then
+ # just configure+build in the gdbserver subdir to speed things up
+ cd gdb/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.
+ is_cross \
+ && myconf+=( --disable-gdbserver ) \
+ || myconf+=( $(use_enable server gdbserver auto) )
+ 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
+ --with-system-readline
+ --with-separate-debug-dir="${EPREFIX}"/usr/lib/debug
+ $(use_with expat)
+ $(use_enable nls)
+ $(use multitarget && echo --enable-targets=all)
+ $(use_with python python "${EPREFIX}/usr/bin/python2")
+ )
+ fi
+
+ econf "${myconf[@]}"
}
src_test() {
@@ -104,24 +130,34 @@
}
src_install() {
- emake \
- DESTDIR="${D}" \
- {include,lib}dir=/nukeme/pretty/pretty/please \
- install || die
- rm -r "${D}"/nukeme || die
+ use server && ! use client && cd gdb/gdbserver
+ emake DESTDIR="${D}" install || die
+ use client && { rm "${ED}"/usr/lib*/libiberty.a || die ; }
+ cd "${S}"
# Don't install docs when building a cross-gdb
if [[ ${CTARGET} != ${CHOST} ]] ; then
rm -r "${ED}"/usr/share
return 0
fi
+ # Install it by hand for now:
+ # http://sourceware.org/ml/gdb-patches/2011-12/msg00915.html
+ # Only install if it exists due to the twisted behavior (see
+ # notes in src_configure above).
+ [[ -e gdb/gdbserver/gdbreplay ]] && { dobin gdb/gdbserver/gdbreplay || die ; }
dodoc README
- docinto gdb
- dodoc gdb/CONTRIBUTE gdb/README gdb/MAINTAINERS \
- gdb/NEWS gdb/ChangeLog gdb/PROBLEMS
+ if use client ; then
+ docinto gdb
+ dodoc gdb/CONTRIBUTE gdb/README gdb/MAINTAINERS \
+ gdb/NEWS gdb/ChangeLog gdb/PROBLEMS
+ fi
docinto sim
- dodoc sim/ChangeLog sim/MAINTAINERS sim/README-HACKING
+ dodoc sim/{ChangeLog,MAINTAINERS,README-HACKING}
+ if use server ; then
+ docinto gdbserver
+ dodoc gdb/gdbserver/{ChangeLog,README}
+ fi
if [[ -n ${PATCH_VER} ]] ; then
dodoc "${WORKDIR}"/extra/gdbinit.sample
@@ -133,7 +169,7 @@
pkg_postinst() {
# portage sucks and doesnt unmerge files in /etc
- rm -vf "${ROOT}"/etc/skel/.gdbinit
+ rm -vf "${EROOT}"/etc/skel/.gdbinit
if use prefix && [[ ${CHOST} == *-darwin* ]] ; then
ewarn "gdb is unable to get a mach task port when installed by Prefix"
1.201 sys-devel/gdb/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/gdb/ChangeLog?rev=1.201&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/gdb/ChangeLog?rev=1.201&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/gdb/ChangeLog?r1=1.200&r2=1.201
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-devel/gdb/ChangeLog,v
retrieving revision 1.200
retrieving revision 1.201
diff -u -r1.200 -r1.201
--- ChangeLog 1 Jan 2012 19:45:57 -0000 1.200
+++ ChangeLog 2 Jan 2012 05:42:56 -0000 1.201
@@ -1,6 +1,12 @@
# ChangeLog for sys-devel/gdb
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/ChangeLog,v 1.200 2012/01/01 19:45:57 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/ChangeLog,v 1.201 2012/01/02 05:42:56 vapier Exp $
+
+ 02 Jan 2012; Mike Frysinger <vapier@gentoo.org> gdb-7.3.1-r1.ebuild,
+ gdb-9999.ebuild:
+ Merge live/non-live ebuilds, fix up USE="-client -server" behavior, and
+ handle gdbserver better in unsupported configurations #396697 by Thomas
+ Sachau.
01 Jan 2012; Fabian Groffen <grobian@gentoo.org> gdb-7.3.1-r1.ebuild:
Remove/check existing files (wrt Prefix offset)
1.3 sys-devel/gdb/gdb-7.3.1-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/gdb/gdb-7.3.1-r1.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/gdb/gdb-7.3.1-r1.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/gdb/gdb-7.3.1-r1.ebuild?r1=1.2&r2=1.3
Index: gdb-7.3.1-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-7.3.1-r1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gdb-7.3.1-r1.ebuild 1 Jan 2012 19:45:57 -0000 1.2
+++ gdb-7.3.1-r1.ebuild 2 Jan 2012 05:42:56 -0000 1.3
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-7.3.1-r1.ebuild,v 1.2 2012/01/01 19:45:57 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-7.3.1-r1.ebuild,v 1.3 2012/01/02 05:42:56 vapier Exp $
EAPI="3"
@@ -48,9 +48,7 @@
SRC_URI="${SRC_URI} ${PATCH_VER:+mirror://gentoo/${P}-patches-${PATCH_VER}.tar.xz}"
LICENSE="GPL-2 LGPL-2"
-is_cross \
- && SLOT="${CTARGET}" \
- || SLOT="0"
+SLOT="0"
if [[ ${PV} != 9999* ]] ; then
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
@@ -94,12 +92,23 @@
$(is_cross && echo --with-sysroot="${EPREFIX}"/usr/${CTARGET})
)
- if use server ; then
- use client || cd gdb/gdbserver
+ if use server && ! use client ; then
+ # just configure+build in the gdbserver subdir to speed things up
+ cd gdb/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.
+ is_cross \
+ && myconf+=( --disable-gdbserver ) \
+ || myconf+=( $(use_enable server gdbserver auto) )
fi
- if use client ; then
+ 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
@@ -110,7 +119,6 @@
$(use_enable nls)
$(use multitarget && echo --enable-targets=all)
$(use_with python python "${EPREFIX}/usr/bin/python2")
- $(use_enable server gdbserver)
)
fi
@@ -132,8 +140,11 @@
rm -r "${ED}"/usr/share
return 0
fi
+ # Install it by hand for now:
# http://sourceware.org/ml/gdb-patches/2011-12/msg00915.html
- use server && { dobin gdb/gdbserver/gdbreplay || die ; }
+ # Only install if it exists due to the twisted behavior (see
+ # notes in src_configure above).
+ [[ -e gdb/gdbserver/gdbreplay ]] && { dobin gdb/gdbserver/gdbreplay || die ; }
dodoc README
if use client ; then
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-devel/gdb: gdb-9999.ebuild ChangeLog gdb-7.3.1-r1.ebuild
@ 2012-01-13 19:13 Mike Frysinger (vapier)
0 siblings, 0 replies; 2+ messages in thread
From: Mike Frysinger (vapier) @ 2012-01-13 19:13 UTC (permalink / raw
To: gentoo-commits
vapier 12/01/13 19:13:57
Modified: gdb-9999.ebuild ChangeLog gdb-7.3.1-r1.ebuild
Log:
Unify live/release ebuilds, and properly control zlib dep.
(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)
Revision Changes Path
1.8 sys-devel/gdb/gdb-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/gdb/gdb-9999.ebuild?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/gdb/gdb-9999.ebuild?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/gdb/gdb-9999.ebuild?r1=1.7&r2=1.8
Index: gdb-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-9999.ebuild,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gdb-9999.ebuild 2 Jan 2012 05:42:56 -0000 1.7
+++ gdb-9999.ebuild 13 Jan 2012 19:13:57 -0000 1.8
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-9999.ebuild,v 1.7 2012/01/02 05:42:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-9999.ebuild,v 1.8 2012/01/13 19:13:57 vapier Exp $
EAPI="3"
@@ -50,15 +50,16 @@
LICENSE="GPL-2 LGPL-2"
SLOT="0"
if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
-IUSE="+client expat multitarget nls +python +server test vanilla"
+IUSE="+client expat multitarget nls +python +server test vanilla zlib"
RDEPEND="!dev-util/gdbserver
>=sys-libs/ncurses-5.2-r2
sys-libs/readline
expat? ( dev-libs/expat )
- python? ( =dev-lang/python-2* )"
+ python? ( =dev-lang/python-2* )
+ zlib? ( sys-libs/zlib )"
DEPEND="${RDEPEND}
app-arch/xz-utils
virtual/yacc
@@ -119,6 +120,7 @@
$(use_enable nls)
$(use multitarget && echo --enable-targets=all)
$(use_with python python "${EPREFIX}/usr/bin/python2")
+ $(use_with zlib)
)
fi
@@ -132,7 +134,7 @@
src_install() {
use server && ! use client && cd gdb/gdbserver
emake DESTDIR="${D}" install || die
- use client && { rm "${ED}"/usr/lib*/libiberty.a || die ; }
+ use client && { find "${ED}"/usr -name libiberty.a -delete || die ; }
cd "${S}"
# Don't install docs when building a cross-gdb
1.205 sys-devel/gdb/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/gdb/ChangeLog?rev=1.205&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/gdb/ChangeLog?rev=1.205&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/gdb/ChangeLog?r1=1.204&r2=1.205
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-devel/gdb/ChangeLog,v
retrieving revision 1.204
retrieving revision 1.205
diff -u -r1.204 -r1.205
--- ChangeLog 10 Jan 2012 11:33:50 -0000 1.204
+++ ChangeLog 13 Jan 2012 19:13:57 -0000 1.205
@@ -1,6 +1,10 @@
# ChangeLog for sys-devel/gdb
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/ChangeLog,v 1.204 2012/01/10 11:33:50 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/ChangeLog,v 1.205 2012/01/13 19:13:57 vapier Exp $
+
+ 13 Jan 2012; Mike Frysinger <vapier@gentoo.org> gdb-7.3.1-r1.ebuild,
+ gdb-9999.ebuild:
+ Unify live/release ebuilds, and properly control zlib dep.
10 Jan 2012; Fabian Groffen <grobian@gentoo.org> gdb-7.3.1-r1.ebuild:
Fix installation with USE=client on 64-bits Solaris targets
1.6 sys-devel/gdb/gdb-7.3.1-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/gdb/gdb-7.3.1-r1.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/gdb/gdb-7.3.1-r1.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/gdb/gdb-7.3.1-r1.ebuild?r1=1.5&r2=1.6
Index: gdb-7.3.1-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-7.3.1-r1.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gdb-7.3.1-r1.ebuild 10 Jan 2012 11:33:50 -0000 1.5
+++ gdb-7.3.1-r1.ebuild 13 Jan 2012 19:13:57 -0000 1.6
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-7.3.1-r1.ebuild,v 1.5 2012/01/10 11:33:50 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-7.3.1-r1.ebuild,v 1.6 2012/01/13 19:13:57 vapier Exp $
EAPI="3"
@@ -52,13 +52,14 @@
if [[ ${PV} != 9999* ]] ; then
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
-IUSE="+client expat multitarget nls +python +server test vanilla"
+IUSE="+client expat multitarget nls +python +server test vanilla zlib"
RDEPEND="!dev-util/gdbserver
>=sys-libs/ncurses-5.2-r2
sys-libs/readline
expat? ( dev-libs/expat )
- python? ( =dev-lang/python-2* )"
+ python? ( =dev-lang/python-2* )
+ zlib? ( sys-libs/zlib )"
DEPEND="${RDEPEND}
app-arch/xz-utils
virtual/yacc
@@ -119,6 +120,7 @@
$(use_enable nls)
$(use multitarget && echo --enable-targets=all)
$(use_with python python "${EPREFIX}/usr/bin/python2")
+ $(use_with zlib)
)
fi
@@ -132,17 +134,7 @@
src_install() {
use server && ! use client && cd gdb/gdbserver
emake DESTDIR="${D}" install || die
- if use client; then
- case ${CHOST} in
- x86_64-*-solaris*|sparcv9-*-solaris*)
- # usr/lib/64 -> usr/lib/{sparcv9,amd64} (no usr/lib64!)
- rm "${ED}"/usr/lib/*/libiberty.a || die
- ;;
- *)
- rm "${ED}"/usr/lib*/libiberty.a || die
- ;;
- esac
- fi
+ use client && { find "${ED}"/usr -name libiberty.a -delete || die ; }
cd "${S}"
# Don't install docs when building a cross-gdb
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-01-13 19:14 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-01-02 5:42 [gentoo-commits] gentoo-x86 commit in sys-devel/gdb: gdb-9999.ebuild ChangeLog gdb-7.3.1-r1.ebuild Mike Frysinger (vapier)
-- strict thread matches above, loose matches on Subject: below --
2012-01-13 19:13 Mike Frysinger (vapier)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox