diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2015-02-27 08:07:49 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2015-02-27 08:07:49 +0000 |
| commit | 0ef30525fb009043858c97d9f4eaf27173dbed92 (patch) | |
| tree | 76dff5b99b856dcdeb9fa2244f065dd273c4821e /sys-libs | |
| parent | Restrict binary distribution with USE=-bindist, #541454 (diff) | |
| download | gentoo-2-0ef30525fb009043858c97d9f4eaf27173dbed92.tar.gz gentoo-2-0ef30525fb009043858c97d9f4eaf27173dbed92.tar.bz2 gentoo-2-0ef30525fb009043858c97d9f4eaf27173dbed92.zip | |
Use more readable CTARGET setup logic.
(Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Diffstat (limited to 'sys-libs')
| -rw-r--r-- | sys-libs/musl/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-libs/musl/musl-1.1.5.ebuild | 8 | ||||
| -rw-r--r-- | sys-libs/musl/musl-1.1.6.ebuild | 6 | ||||
| -rw-r--r-- | sys-libs/musl/musl-9999.ebuild | 8 |
4 files changed, 16 insertions, 12 deletions
diff --git a/sys-libs/musl/ChangeLog b/sys-libs/musl/ChangeLog index 1a9b42aeefbd..1f172425b6ae 100644 --- a/sys-libs/musl/ChangeLog +++ b/sys-libs/musl/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-libs/musl # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/musl/ChangeLog,v 1.41 2015/01/14 21:08:50 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/musl/ChangeLog,v 1.42 2015/02/27 08:07:49 vapier Exp $ + + 27 Feb 2015; Mike Frysinger <vapier@gentoo.org> musl-1.1.5.ebuild, + musl-1.1.6.ebuild, musl-9999.ebuild: + Use more readable CTARGET setup logic. 14 Jan 2015; Anthony G. Basile <blueness@gentoo.org> musl-1.1.6.ebuild: Stable on amd64, arm, ppc and x86 diff --git a/sys-libs/musl/musl-1.1.5.ebuild b/sys-libs/musl/musl-1.1.5.ebuild index 662d8b67bc87..5f20dbb832ef 100644 --- a/sys-libs/musl/musl-1.1.5.ebuild +++ b/sys-libs/musl/musl-1.1.5.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/musl/musl-1.1.5.ebuild,v 1.5 2014/11/18 18:29:40 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/musl/musl-1.1.5.ebuild,v 1.6 2015/02/27 08:07:49 vapier Exp $ EAPI=5 @@ -13,8 +13,8 @@ fi export CBUILD=${CBUILD:-${CHOST}} export CTARGET=${CTARGET:-${CHOST}} if [[ ${CTARGET} == ${CHOST} ]] ; then - if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then - export CTARGET=${CATEGORY/cross-} + if [[ ${CATEGORY} == cross-* ]] ; then + export CTARGET=${CATEGORY#cross-} fi fi diff --git a/sys-libs/musl/musl-1.1.6.ebuild b/sys-libs/musl/musl-1.1.6.ebuild index 0a1f8475df4e..29cce8a9c096 100644 --- a/sys-libs/musl/musl-1.1.6.ebuild +++ b/sys-libs/musl/musl-1.1.6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/musl/musl-1.1.6.ebuild,v 1.2 2015/01/14 21:08:50 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/musl/musl-1.1.6.ebuild,v 1.3 2015/02/27 08:07:49 vapier Exp $ EAPI=5 @@ -13,8 +13,8 @@ fi export CBUILD=${CBUILD:-${CHOST}} export CTARGET=${CTARGET:-${CHOST}} if [[ ${CTARGET} == ${CHOST} ]] ; then - if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then - export CTARGET=${CATEGORY/cross-} + if [[ ${CATEGORY} == cross-* ]] ; then + export CTARGET=${CATEGORY#cross-} fi fi diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-9999.ebuild index 8ca3c18e0153..271f2cc8bf1b 100644 --- a/sys-libs/musl/musl-9999.ebuild +++ b/sys-libs/musl/musl-9999.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/musl/musl-9999.ebuild,v 1.12 2014/11/18 18:26:22 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/musl/musl-9999.ebuild,v 1.13 2015/02/27 08:07:49 vapier Exp $ EAPI=5 @@ -13,8 +13,8 @@ fi export CBUILD=${CBUILD:-${CHOST}} export CTARGET=${CTARGET:-${CHOST}} if [[ ${CTARGET} == ${CHOST} ]] ; then - if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then - export CTARGET=${CATEGORY/cross-} + if [[ ${CATEGORY} == cross-* ]] ; then + export CTARGET=${CATEGORY#cross-} fi fi |