public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Mike Frysinger (vapier)" <vapier@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] gentoo-x86 commit in eclass: toolchain-binutils.eclass
Date: Thu, 26 Apr 2012 02:14:55 +0000 (UTC)	[thread overview]
Message-ID: <20120426021455.1B0D62004C@flycatcher.gentoo.org> (raw)

vapier      12/04/26 02:14:55

  Modified:             toolchain-binutils.eclass
  Log:
  use .xz tarballs with newer hjlu releases

Revision  Changes    Path
1.112                eclass/toolchain-binutils.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain-binutils.eclass?rev=1.112&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain-binutils.eclass?rev=1.112&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain-binutils.eclass?r1=1.111&r2=1.112

Index: toolchain-binutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain-binutils.eclass,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- toolchain-binutils.eclass	5 Mar 2012 18:55:47 -0000	1.111
+++ toolchain-binutils.eclass	26 Apr 2012 02:14:55 -0000	1.112
@@ -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/eclass/toolchain-binutils.eclass,v 1.111 2012/03/05 18:55:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain-binutils.eclass,v 1.112 2012/04/26 02:14:55 vapier Exp $
 #
 # Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
 #
@@ -48,7 +48,7 @@
 	;;
 esac
 
-inherit eutils libtool flag-o-matic gnuconfig multilib versionator ${extra_eclass}
+inherit eutils libtool flag-o-matic gnuconfig multilib versionator unpacker ${extra_eclass}
 EXPORT_FUNCTIONS src_unpack src_compile src_test src_install pkg_postinst pkg_postrm
 
 export CTARGET=${CTARGET:-${CHOST}}
@@ -65,18 +65,25 @@
 case ${BTYPE} in
 	cvs|git) SRC_URI="" ;;
 	snap) SRC_URI="ftp://gcc.gnu.org/pub/binutils/snapshots/binutils-${BVER}.tar.bz2" ;;
-	hjlu) SRC_URI="mirror://kernel/linux/devel/binutils/binutils-${BVER}.tar.bz2" ;;
+	hjlu)
+		SRC_URI="mirror://kernel/linux/devel/binutils/binutils-${BVER}.tar."
+		version_is_at_least 2.21 && SRC_URI+="xz" || SRC_URI+="bz2" ;;
 	rel) SRC_URI="mirror://gnu/binutils/binutils-${BVER}.tar.bz2" ;;
 esac
 add_src_uri() {
 	[[ -z $2 ]] && return
 	local a=$1
+	if [[ ${BTYPE} == "hjlu" ]] && version_is_at_least 2.22.52.0.2 ; then
+		a+=".xz"
+	else
+		a+=".bz2"
+	fi
 	set -- mirror://gentoo http://dev.gentoo.org/~vapier/dist
 	SRC_URI="${SRC_URI} ${@/%//${a}}"
 }
-add_src_uri binutils-${BVER}-patches-${PATCHVER}.tar.bz2 ${PATCHVER}
-add_src_uri binutils-${BVER}-uclibc-patches-${UCLIBC_PATCHVER}.tar.bz2 ${UCLIBC_PATCHVER}
-add_src_uri elf2flt-${ELF2FLT_VER}.tar.bz2 ${ELF2FLT_VER}
+add_src_uri binutils-${BVER}-patches-${PATCHVER}.tar ${PATCHVER}
+add_src_uri binutils-${BVER}-uclibc-patches-${UCLIBC_PATCHVER}.tar ${UCLIBC_PATCHVER}
+add_src_uri elf2flt-${ELF2FLT_VER}.tar ${ELF2FLT_VER}
 
 if version_is_at_least 2.18 ; then
 	LICENSE="|| ( GPL-3 LGPL-3 )"
@@ -121,7 +128,7 @@
 	case ${BTYPE} in
 	cvs) cvs_src_unpack ;;
 	git) git-2_src_unpack ;;
-	*)   unpack ${A} ;;
+	*)   unpacker ${A} ;;
 	esac
 	mkdir -p "${MY_BUILDDIR}"
 	[[ -d ${WORKDIR}/patch ]] && mkdir "${WORKDIR}"/patch/skip






             reply	other threads:[~2012-04-26  2:15 UTC|newest]

Thread overview: 59+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-04-26  2:14 Mike Frysinger (vapier) [this message]
  -- strict thread matches above, loose matches on Subject: below --
2015-05-25  8:39 [gentoo-commits] gentoo-x86 commit in eclass: toolchain-binutils.eclass Mike Frysinger (vapier)
2015-02-09 19:34 Mike Frysinger (vapier)
2015-02-09 15:47 Mike Frysinger (vapier)
2015-02-09 15:43 Mike Frysinger (vapier)
2014-11-08 17:12 Mike Frysinger (vapier)
2014-11-02 19:36 Mike Frysinger (vapier)
2014-09-09 22:29 Mike Frysinger (vapier)
2014-08-11 13:32 Mike Frysinger (vapier)
2014-06-07  5:08 Mike Frysinger (vapier)
2014-06-06 19:33 Mike Frysinger (vapier)
2014-01-06 16:10 Mike Frysinger (vapier)
2013-12-22 20:59 Mike Frysinger (vapier)
2013-11-21  4:07 Mike Frysinger (vapier)
2013-11-20  8:13 Mike Frysinger (vapier)
2013-10-11 18:35 Mike Frysinger (vapier)
2013-02-09  4:32 Mike Frysinger (vapier)
2012-12-23 23:37 Mike Frysinger (vapier)
2012-11-26 18:06 Mike Frysinger (vapier)
2012-10-24  3:24 Mike Frysinger (vapier)
2012-10-17 19:14 Mike Frysinger (vapier)
2012-07-27 17:05 Mike Frysinger (vapier)
2012-07-27 17:03 Mike Frysinger (vapier)
2012-07-27 17:02 Mike Frysinger (vapier)
2012-05-03  2:32 Mike Frysinger (vapier)
2012-05-03  2:29 Mike Frysinger (vapier)
2012-03-05 18:55 Mike Frysinger (vapier)
2012-03-05  5:13 Mike Frysinger (vapier)
2012-02-05  2:33 Mike Frysinger (vapier)
2011-12-21 21:44 Mike Frysinger (vapier)
2011-12-21 21:01 Mike Frysinger (vapier)
2011-12-12 22:47 Mike Frysinger (vapier)
2011-12-12 22:23 Mike Frysinger (vapier)
2011-11-29 22:45 Mike Frysinger (vapier)
2011-11-29 20:10 Mike Frysinger (vapier)
2011-10-28  7:58 Mike Frysinger (vapier)
2011-09-19 14:34 Mike Frysinger (vapier)
2011-09-18  9:22 Mike Frysinger (vapier)
2011-08-11  2:17 Mike Frysinger (vapier)
2011-03-18 19:51 Mike Frysinger (vapier)
2011-03-10  4:28 Mike Frysinger (vapier)
2011-03-08  8:36 Ryan Hill (dirtyepic)
2011-03-02  6:37 Mike Frysinger (vapier)
2010-12-09  1:32 Ryan Hill (dirtyepic)
2010-12-01 11:45 Mike Frysinger (vapier)
2010-12-01 11:22 Mike Frysinger (vapier)
2010-04-19 23:02 Mike Frysinger (vapier)
2010-03-07 16:32 Mike Frysinger (vapier)
2010-01-28  0:25 Mike Frysinger (vapier)
2009-12-24 13:16 Mike Frysinger (vapier)
2009-12-19 15:48 Mike Frysinger (vapier)
2009-11-21  5:06 Mike Frysinger (vapier)
2009-09-06 16:58 Mike Frysinger (vapier)
2009-05-23 23:07 Mike Frysinger (vapier)
2009-05-10  1:41 Mark Loeser (halcy0n)
2009-05-09 20:57 Mike Frysinger (vapier)
2009-05-03  0:12 Mark Loeser (halcy0n)
2008-12-09  6:06 Joshua Kinard (kumba)
2007-11-11 19:55 Mike Frysinger (vapier)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20120426021455.1B0D62004C@flycatcher.gentoo.org \
    --to=vapier@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox