Remove "|| die" when using econf, thanks to Thomas Anderson

<gentoofan23 AT gentoo DOT org>; bug #253629


git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/devmanual/trunk@143 176d3534-300d-0410-8db8-84e73ed771c3

6 files changed, 17 insertions, 20 deletions

diff --git a/ebuild-writing/functions/src_compile/configuring/text.xml b/ebuild-writing/functions/src_compile/configuring/text.xml
index b085906..dced3d0 100644
--- a/ebuild-writing/functions/src_compile/configuring/text.xml
+++ b/ebuild-writing/functions/src_compile/configuring/text.xml
@@ -34,8 +34,7 @@ src_compile() {
     econf \
         $(use_enable perl ) \
         $(use_enable python ) \
-        $(use_enable ruby ) \
-        || die "Configure failed!"
+        $(use_enable ruby )
 
     # ...
 }
@@ -44,7 +43,7 @@ src_compile() {
     # Our package optional IPv6 support which uses --with rather than
     # --enable / --disable
 
-    econf $(use_with ipv6 ) || die "econf failed!"
+    econf $(use_with ipv6 )
 
     # ...
 }
@@ -63,14 +62,13 @@ src_compile() {
     econf \
         $(use_enable perl perlinterp ) \
         $(use_enable python pythoninterp ) \
-        $(use_enable ruby rubyinterp ) \
-        || die "Configure failed!"
+        $(use_enable ruby rubyinterp )
 
     # ...
 }
 
 src_compile() {
-    econf $(use_with X x11 ) || die "econf failed!"
+    econf $(use_with X x11 )
 }
 </codesample>
 
diff --git a/ebuild-writing/functions/src_compile/text.xml b/ebuild-writing/functions/src_compile/text.xml
index 4e0709b..68366dc 100644
--- a/ebuild-writing/functions/src_compile/text.xml
+++ b/ebuild-writing/functions/src_compile/text.xml
@@ -54,8 +54,7 @@ src_compile() {
 
     econf \
         $(use_enable ssl ) \
-        $(use_enable perl perlinterp ) \
-        || die "Configure failed!"
+        $(use_enable perl perlinterp )
 
     emake || die "Make failed!"
 }
diff --git a/ebuild-writing/using-eclasses/text.xml b/ebuild-writing/using-eclasses/text.xml
index a40ddbc..dd53011 100644
--- a/ebuild-writing/using-eclasses/text.xml
+++ b/ebuild-writing/using-eclasses/text.xml
@@ -60,7 +60,7 @@ src_compile() {
     einfo "Running autoreconf"
     autoreconf -f -i || die "autoreconf failed"
     replace-flags -O? -O1
-    econf --sysconfdir=/etc/devtodo || die "econf failed"
+    econf --sysconfdir=/etc/devtodo
     emake || die "emake failed"
 }
 
diff --git a/general-concepts/autotools/text.xml b/general-concepts/autotools/text.xml
index 26d14a1..866ebc1 100644
--- a/general-concepts/autotools/text.xml
+++ b/general-concepts/autotools/text.xml
@@ -126,7 +126,7 @@ src_unpack() {
 }
 
 src_compile() {
-    econf $(use_enable nls) || die "econf failed"
+    econf $(use_enable nls)
     emake || die "emake failed"
 }
 </codesample>
diff --git a/general-concepts/use-flags/text.xml b/general-concepts/use-flags/text.xml
index 0717f6f..f1b1a82 100644
--- a/general-concepts/use-flags/text.xml
+++ b/general-concepts/use-flags/text.xml
@@ -176,8 +176,7 @@ src_compile() {
 
     econf \
         # Other stuff
-        ${myconf} \
-        || die "configure failed"
+        ${myconf}
 
     emake || die "make failed"
 }
diff --git a/quickstart/text.xml b/quickstart/text.xml
index 7de7707..af51f16 100644
--- a/quickstart/text.xml
+++ b/quickstart/text.xml
@@ -48,7 +48,7 @@ KEYWORDS="~mips ~sparc ~x86"
 IUSE=""
 
 src_compile() {
-    econf --with-posix-regex || die "econf failed"
+    econf --with-posix-regex
     emake || die "emake failed"
 }
 
@@ -135,10 +135,12 @@ details.
 Next, a function named <c>src_compile</c>. Portage will call this
 function when it wants to <e>compile</e> the package. The <c>econf</c>
 function is a wrapper for calling <c>./configure</c>, and <c>emake</c>
-is a wrapper for <c>make</c>. In both cases, the common <c>|| die
+is a wrapper for <c>make</c>. In the case of emake, the common <c>|| die
 &quot;something went wrong&quot;</c> idiom is used <d/> this is to
 ensure that if for some reason an error occurs, Portage will stop
-rather than trying to continue with the install.
+rather than trying to continue with the install. Note that <c>econf</c>
+does not need the <c>|| die</c> idiom, as it dies by itself if something
+failed.
 </p>
 
 <p>
@@ -214,7 +216,7 @@ DEPEND="dev-libs/popt
 RDEPEND="dev-libs/popt"
 
 src_compile() {
-    econf --with-popt || die "econf failed"
+    econf --with-popt
     emake || die "emake failed"
 }
 
@@ -288,7 +290,7 @@ src_unpack() {
 }
 
 src_compile() {
-    econf --with-popt || die "econf failed"
+    econf --with-popt
     emake || die "emake failed"
 }
 
@@ -336,7 +338,7 @@ DEPEND="virtual/libc
     !sys-libs/glibc"
 
 src_compile() {
-    econf $(use_enable nls) || die "econf failed"
+    econf $(use_enable nls)
     emake || die
 }
 
@@ -410,8 +412,7 @@ src_compile() {
         $(use_enable ipv6) \
         $(use_enable imlib) \
         $(use_enable gnome gdk-pixbuf) \
-        $(use_enable xface compface) \
-        || die
+        $(use_enable xface compface)
 
     emake || die
 }