| 1 |
vapier 11/10/04 18:36:31 |
| 2 |
|
| 3 |
Modified: ChangeLog baselayout-2.1.ebuild |
| 4 |
Log: |
| 5 |
Try to make error output a little more understandable #385625 by Paul Varner. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha59/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.513 sys-apps/baselayout/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/baselayout/ChangeLog?rev=1.513&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/baselayout/ChangeLog?rev=1.513&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/baselayout/ChangeLog?r1=1.512&r2=1.513 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v |
| 19 |
retrieving revision 1.512 |
| 20 |
retrieving revision 1.513 |
| 21 |
diff -u -r1.512 -r1.513 |
| 22 |
--- ChangeLog 3 Oct 2011 03:59:17 -0000 1.512 |
| 23 |
+++ ChangeLog 4 Oct 2011 18:36:31 -0000 1.513 |
| 24 |
@@ -1,10 +1,13 @@ |
| 25 |
# ChangeLog for sys-apps/baselayout |
| 26 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.512 2011/10/03 03:59:17 vapier Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.513 2011/10/04 18:36:31 vapier Exp $ |
| 29 |
|
| 30 |
# See the rc-scripts ChangeLog in subversion for release info: |
| 31 |
# http://sources.gentoo.org/viewcvs.py/*checkout*/baselayout/trunk/ChangeLog |
| 32 |
|
| 33 |
+ 04 Oct 2011; Mike Frysinger <vapier@g.o> baselayout-2.1.ebuild: |
| 34 |
+ Try to make error output a little more understandable #385625 by Paul Varner. |
| 35 |
+ |
| 36 |
*baselayout-2.1 (03 Oct 2011) |
| 37 |
|
| 38 |
03 Oct 2011; Mike Frysinger <vapier@g.o> +baselayout-2.1.ebuild: |
| 39 |
|
| 40 |
|
| 41 |
|
| 42 |
1.2 sys-apps/baselayout/baselayout-2.1.ebuild |
| 43 |
|
| 44 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/baselayout/baselayout-2.1.ebuild?rev=1.2&view=markup |
| 45 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/baselayout/baselayout-2.1.ebuild?rev=1.2&content-type=text/plain |
| 46 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/baselayout/baselayout-2.1.ebuild?r1=1.1&r2=1.2 |
| 47 |
|
| 48 |
Index: baselayout-2.1.ebuild |
| 49 |
=================================================================== |
| 50 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-2.1.ebuild,v |
| 51 |
retrieving revision 1.1 |
| 52 |
retrieving revision 1.2 |
| 53 |
diff -u -r1.1 -r1.2 |
| 54 |
--- baselayout-2.1.ebuild 3 Oct 2011 03:59:17 -0000 1.1 |
| 55 |
+++ baselayout-2.1.ebuild 4 Oct 2011 18:36:31 -0000 1.2 |
| 56 |
@@ -1,6 +1,6 @@ |
| 57 |
# Copyright 1999-2011 Gentoo Foundation |
| 58 |
# Distributed under the terms of the GNU General Public License v2 |
| 59 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-2.1.ebuild,v 1.1 2011/10/03 03:59:17 vapier Exp $ |
| 60 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-2.1.ebuild,v 1.2 2011/10/04 18:36:31 vapier Exp $ |
| 61 |
|
| 62 |
inherit eutils multilib |
| 63 |
|
| 64 |
@@ -21,6 +21,17 @@ |
| 65 |
} |
| 66 |
|
| 67 |
# Create our multilib dirs - the Makefile has no knowledge of this |
| 68 |
+multilib_warn() { |
| 69 |
+ local syms=$1 dirs=$2 def_libdir=$3 |
| 70 |
+ |
| 71 |
+ [ -z "${syms}${dirs}" ] && return |
| 72 |
+ |
| 73 |
+ ewarn "Your system profile has SYMLINK_LIB=${SYMLINK_LIB}, so that means" |
| 74 |
+ if [ -z "${syms}" ] ; then |
| 75 |
+ ewarn "you need to have these paths as symlinks to ${def_libdir}:" |
| 76 |
+ ewarn "$1" |
| 77 |
+ fi |
| 78 |
+} |
| 79 |
multilib_layout() { |
| 80 |
local libdir libdirs=$(get_all_libdirs) def_libdir=$(get_abi_LIBDIR $DEFAULT_ABI) |
| 81 |
: ${libdirs:=lib} # it isn't that we don't trust multilib.eclass... |
| 82 |
@@ -38,16 +49,13 @@ |
| 83 |
fi |
| 84 |
done |
| 85 |
done |
| 86 |
- if [ -n "${syms}" ] ; then |
| 87 |
- ewarn "Based on your profile, these paths should be directories:" |
| 88 |
- ewarn "${syms}" |
| 89 |
- ewarn "Failure to fix this may result in a broken system." |
| 90 |
- echo |
| 91 |
- fi |
| 92 |
- if [ -n "${dirs}" ] ; then |
| 93 |
- ewarn "Based on your profile, these paths should be symlinks:" |
| 94 |
- ewarn "${dirs}" |
| 95 |
- ewarn "Failure to fix this may result in a broken system." |
| 96 |
+ if [ -n "${syms}${dirs}" ] ; then |
| 97 |
+ ewarn "Your system profile has SYMLINK_LIB=${SYMLINK_LIB:-no}, so that means you need to" |
| 98 |
+ ewarn "have these paths configured as follows:" |
| 99 |
+ [ -n "${dirs}" ] && ewarn "symlinks to '${def_libdir}':${dirs}" |
| 100 |
+ [ -n "${syms}" ] && ewarn "directories:${syms}" |
| 101 |
+ ewarn "The ebuild will attempt to fix these, but only for trivial conversions." |
| 102 |
+ ewarn "If things fail, you will need to manually create/move the directories." |
| 103 |
echo |
| 104 |
fi |
Archives