[118736] trunk/base

[jeremyhu at macports.org]

Revision: 118736
          https://trac.macports.org/changeset/118736
Author:   jeremyhu at macports.org
Date:     2014-04-09 18:19:39 -0700 (Wed, 09 Apr 2014)
Log Message:
-----------
Fix configure when the BZIP2 envvar is set

configure: === extracting vendor/tclx8.4.1.tar.bz2
bzip2: Can't guess original name for /usr/bin/bzip2 -- using /usr/bin/bzip2.out
bzip2: Input file /usr/bin/bzip2 has 2 other links.
configure: error: tarball vendor/tclx8.4.1.tar.bz2 did not extract to vendor/tclx8.4
make: *** [config.status] Error 1

Modified Paths:
--------------
    trunk/base/aclocal.m4
    trunk/base/configure

Modified: trunk/base/aclocal.m4
===================================================================
--- trunk/base/aclocal.m4	2014-04-10 01:14:17 UTC (rev 118735)
+++ trunk/base/aclocal.m4	2014-04-10 01:19:39 UTC (rev 118736)
@@ -138,7 +138,7 @@
 				AC_MSG_ERROR([Don't know how to extract tarball $mp_tarball])
 				;;
 		esac
-		(cd "$mp_tarball_vendordir"; "$mp_tarball_extract_cmd" -d < "$ac_abs_confdir/$mp_tarball" | tar xf - || AC_MSG_ERROR([failed to extract $mp_tarball]))
+		(cd "$mp_tarball_vendordir"; "$mp_tarball_extract_cmd" -dc "$ac_abs_confdir/$mp_tarball" | tar xf - || AC_MSG_ERROR([failed to extract $mp_tarball]))
 	fi
 	if ! test -d "$ac_dir"; then
 		AC_MSG_ERROR([tarball $mp_tarball did not extract to $ac_dir])

Modified: trunk/base/configure
===================================================================
--- trunk/base/configure	2014-04-10 01:14:17 UTC (rev 118735)
+++ trunk/base/configure	2014-04-10 01:19:39 UTC (rev 118736)
@@ -9619,7 +9619,7 @@
 				as_fn_error $? "Don't know how to extract tarball $mp_tarball" "$LINENO" 5
 				;;
 		esac
-		(cd "$mp_tarball_vendordir"; "$mp_tarball_extract_cmd" -d < "$ac_abs_confdir/$mp_tarball" | tar xf - || as_fn_error $? "failed to extract $mp_tarball" "$LINENO" 5)
+		(cd "$mp_tarball_vendordir"; "$mp_tarball_extract_cmd" -dc "$ac_abs_confdir/$mp_tarball" | tar xf - || as_fn_error $? "failed to extract $mp_tarball" "$LINENO" 5)
 	fi
 	if ! test -d "$ac_dir"; then
 		as_fn_error $? "tarball $mp_tarball did not extract to $ac_dir" "$LINENO" 5
@@ -10036,7 +10036,7 @@
 				as_fn_error $? "Don't know how to extract tarball $mp_tarball" "$LINENO" 5
 				;;
 		esac
-		(cd "$mp_tarball_vendordir"; "$mp_tarball_extract_cmd" -d < "$ac_abs_confdir/$mp_tarball" | tar xf - || as_fn_error $? "failed to extract $mp_tarball" "$LINENO" 5)
+		(cd "$mp_tarball_vendordir"; "$mp_tarball_extract_cmd" -dc "$ac_abs_confdir/$mp_tarball" | tar xf - || as_fn_error $? "failed to extract $mp_tarball" "$LINENO" 5)
 	fi
 	if ! test -d "$ac_dir"; then
 		as_fn_error $? "tarball $mp_tarball did not extract to $ac_dir" "$LINENO" 5
@@ -10448,7 +10448,7 @@
 				as_fn_error $? "Don't know how to extract tarball $mp_tarball" "$LINENO" 5
 				;;
 		esac
-		(cd "$mp_tarball_vendordir"; "$mp_tarball_extract_cmd" -d < "$ac_abs_confdir/$mp_tarball" | tar xf - || as_fn_error $? "failed to extract $mp_tarball" "$LINENO" 5)
+		(cd "$mp_tarball_vendordir"; "$mp_tarball_extract_cmd" -dc "$ac_abs_confdir/$mp_tarball" | tar xf - || as_fn_error $? "failed to extract $mp_tarball" "$LINENO" 5)
 	fi
 	if ! test -d "$ac_dir"; then
 		as_fn_error $? "tarball $mp_tarball did not extract to $ac_dir" "$LINENO" 5
@@ -10862,7 +10862,7 @@
 				as_fn_error $? "Don't know how to extract tarball $mp_tarball" "$LINENO" 5
 				;;
 		esac
-		(cd "$mp_tarball_vendordir"; "$mp_tarball_extract_cmd" -d < "$ac_abs_confdir/$mp_tarball" | tar xf - || as_fn_error $? "failed to extract $mp_tarball" "$LINENO" 5)
+		(cd "$mp_tarball_vendordir"; "$mp_tarball_extract_cmd" -dc "$ac_abs_confdir/$mp_tarball" | tar xf - || as_fn_error $? "failed to extract $mp_tarball" "$LINENO" 5)
 	fi
 	if ! test -d "$ac_dir"; then
 		as_fn_error $? "tarball $mp_tarball did not extract to $ac_dir" "$LINENO" 5
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140409/63baa9e5/attachment.html>