diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2010-04-23 11:02:00 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2010-04-23 11:02:00 +0000 |
| commit | 4101006b2f04ea1cd9ece7218ae96e96f51ba996 (patch) | |
| tree | db442ab5e043c2d53bcf1583c62faf8bb3573455 /profiles/default | |
| parent | Removed dev-java/kaffe from mask due to final removal, #309459. (diff) | |
| download | gentoo-2-4101006b2f04ea1cd9ece7218ae96e96f51ba996.tar.gz gentoo-2-4101006b2f04ea1cd9ece7218ae96e96f51ba996.tar.bz2 gentoo-2-4101006b2f04ea1cd9ece7218ae96e96f51ba996.zip | |
Do not try to access $S if it does not exist.
Diffstat (limited to 'profiles/default')
| -rw-r--r-- | profiles/default/bsd/ChangeLog | 6 | ||||
| -rw-r--r-- | profiles/default/bsd/fbsd/profile.bashrc | 6 | ||||
| -rw-r--r-- | profiles/default/bsd/profile.bashrc | 2 |
3 files changed, 11 insertions, 3 deletions
diff --git a/profiles/default/bsd/ChangeLog b/profiles/default/bsd/ChangeLog index e9a9d1762d31..926e2b6257eb 100644 --- a/profiles/default/bsd/ChangeLog +++ b/profiles/default/bsd/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for profile directory # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/ChangeLog,v 1.34 2010/04/22 18:30:24 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/ChangeLog,v 1.35 2010/04/23 11:01:59 aballier Exp $ + + 23 Apr 2010; Alexis Ballier <aballier@gentoo.org> fbsd/profile.bashrc, + profile.bashrc: + Do not try to access $S if it does not exist. 22 Apr 2010; Alexis Ballier <aballier@gentoo.org> fbsd/package.use.mask: unmask ruby[threads], seems to work diff --git a/profiles/default/bsd/fbsd/profile.bashrc b/profiles/default/bsd/fbsd/profile.bashrc index 9d763478b87a..8492e476ad28 100644 --- a/profiles/default/bsd/fbsd/profile.bashrc +++ b/profiles/default/bsd/fbsd/profile.bashrc @@ -1,6 +1,6 @@ #!/bin/bash # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/fbsd/profile.bashrc,v 1.7 2010/04/03 11:49:51 the_paya Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/fbsd/profile.bashrc,v 1.8 2010/04/23 11:02:00 aballier Exp $ alias make=gmake alias patch=gpatch @@ -39,6 +39,10 @@ bsd-patch_install-sh() { if [[ -z $(type -P gpatch) ]]; then return 0 fi + + # Do nothing if $S does not exist + [ -d "${S}" ] || return 0 + local EPDIR="${ECLASSDIR}/ELT-patches/install-sh" local EPATCHES="${EPDIR}/1.5.6 ${EPDIR}/1.5.4 ${EPDIR}/1.5" local ret=0 diff --git a/profiles/default/bsd/profile.bashrc b/profiles/default/bsd/profile.bashrc index 0cf58d3be47f..4c5ecd579207 100644 --- a/profiles/default/bsd/profile.bashrc +++ b/profiles/default/bsd/profile.bashrc @@ -1,4 +1,4 @@ -if [[ ${EBUILD_PHASE} == compile ]] ; then +if [[ ${EBUILD_PHASE} == compile ]] && [ -d "${S}" ] ; then if grep -q "Assume that mode_t is passed compatibly" ${S} -r --include openat.c; then eerror "The source code contains a faulty openat.c unit from gnulib." eerror "Please report this on Gentoo Bugzilla in Gentoo/Alt product for component FreeBSD." |