commit: e300e38ae7903fe4c942f60b3eb6a4dca4174049
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 13 20:44:37 2016 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Sat Feb 13 20:47:06 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e300e38a
sys-devel/gdb: force zlib w/newer versions
Upstream has moved to using zlib all the time, so update the deps and
configure flags to match. Otherwise we'd end up using the local zlib.
sys-devel/gdb/gdb-7.10-r1.ebuild | 9 ++++++---
sys-devel/gdb/gdb-7.10.1.ebuild | 9 ++++++---
sys-devel/gdb/gdb-9999.ebuild | 9 ++++++---
3 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/sys-devel/gdb/gdb-7.10-r1.ebuild b/sys-devel/gdb/gdb-7.10-r1.ebuild
index 9e9dde1..8d9e6c9 100644
--- a/sys-devel/gdb/gdb-7.10-r1.ebuild
+++ b/sys-devel/gdb/gdb-7.10-r1.ebuild
@@ -59,7 +59,7 @@ SLOT="0"
if [[ ${PV} != 9999* ]] ; then
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64
~s390 ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux
~arm-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris
~x64-solaris ~x86-solaris"
fi
-IUSE="+client expat lzma multitarget nls +python +server test vanilla zlib"
+IUSE="+client expat lzma multitarget nls +python +server test vanilla"
REQUIRED_USE="
python? ( ${PYTHON_REQUIRED_USE} )
|| ( client server )
@@ -72,7 +72,7 @@ RDEPEND="server? ( !dev-util/gdbserver )
expat? ( dev-libs/expat )
lzma? ( app-arch/xz-utils )
python? ( ${PYTHON_DEPS} )
- zlib? ( sys-libs/zlib )
+ sys-libs/zlib
)"
DEPEND="${RDEPEND}
app-arch/xz-utils
@@ -149,13 +149,16 @@ src_configure() {
# 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 expat)
$(use_with lzma)
$(use_enable nls)
$(use multitarget && echo --enable-targets=all)
$(use_with python python "${EPYTHON}")
- $(use_with zlib)
)
fi
diff --git a/sys-devel/gdb/gdb-7.10.1.ebuild b/sys-devel/gdb/gdb-7.10.1.ebuild
index 99e8b65..e83f85c 100644
--- a/sys-devel/gdb/gdb-7.10.1.ebuild
+++ b/sys-devel/gdb/gdb-7.10.1.ebuild
@@ -59,7 +59,7 @@ SLOT="0"
if [[ ${PV} != 9999* ]] ; then
KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390
sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux
~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris
~x86-solaris"
fi
-IUSE="+client expat lzma multitarget nls +python +server test vanilla zlib"
+IUSE="+client expat lzma multitarget nls +python +server test vanilla"
REQUIRED_USE="
python? ( ${PYTHON_REQUIRED_USE} )
|| ( client server )
@@ -72,7 +72,7 @@ RDEPEND="server? ( !dev-util/gdbserver )
expat? ( dev-libs/expat )
lzma? ( app-arch/xz-utils )
python? ( ${PYTHON_DEPS} )
- zlib? ( sys-libs/zlib )
+ sys-libs/zlib
)"
DEPEND="${RDEPEND}
app-arch/xz-utils
@@ -149,13 +149,16 @@ src_configure() {
# 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 expat)
$(use_with lzma)
$(use_enable nls)
$(use multitarget && echo --enable-targets=all)
$(use_with python python "${EPYTHON}")
- $(use_with zlib)
)
fi
diff --git a/sys-devel/gdb/gdb-9999.ebuild b/sys-devel/gdb/gdb-9999.ebuild
index 9e9dde1..8d9e6c9 100644
--- a/sys-devel/gdb/gdb-9999.ebuild
+++ b/sys-devel/gdb/gdb-9999.ebuild
@@ -59,7 +59,7 @@ SLOT="0"
if [[ ${PV} != 9999* ]] ; then
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64
~s390 ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux
~arm-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris
~x64-solaris ~x86-solaris"
fi
-IUSE="+client expat lzma multitarget nls +python +server test vanilla zlib"
+IUSE="+client expat lzma multitarget nls +python +server test vanilla"
REQUIRED_USE="
python? ( ${PYTHON_REQUIRED_USE} )
|| ( client server )
@@ -72,7 +72,7 @@ RDEPEND="server? ( !dev-util/gdbserver )
expat? ( dev-libs/expat )
lzma? ( app-arch/xz-utils )
python? ( ${PYTHON_DEPS} )
- zlib? ( sys-libs/zlib )
+ sys-libs/zlib
)"
DEPEND="${RDEPEND}
app-arch/xz-utils
@@ -149,13 +149,16 @@ src_configure() {
# 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 expat)
$(use_with lzma)
$(use_enable nls)
$(use multitarget && echo --enable-targets=all)
$(use_with python python "${EPYTHON}")
- $(use_with zlib)
)
fi
