[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[PATCH/dpkg-cross] make detect_arch() default to $DPKGCROSSARCH, if possible



This patch fixes the difficult cases (mostly concerns alternate libc),
when strip tries to detect crossprefix, does that incorrectly and
defaults to /usr/bin/strip.
Since /usr/share/dpkg-cross/strip gets called only within dpkg-cross
environment, this fix seems acceptable.

--- dpkg-cross/trunk/dpkg-cross.pl.orig	2006-06-02 16:18:23.000000000 +0200
+++ dpkg-cross/dpkg-cross.pl	2006-06-12 16:04:42.000000000 +0200
@@ -362,7 +363,10 @@
	my $file_ = shift (@_);

	my $string_ = `LC_ALL=C file -L "$file_" 2>/dev/null`;
-	for my $arch_ (keys(%archdetecttable)) {
+	my $arch_ = $ENV{'DPKGCROSSARCH'} || $ENV{'ARCH'};
+	return $arch_ if $arch_;
+
+	for $arch_ (keys(%archdetecttable)) {
		my $re_ = $archdetecttable{$arch_};
		if ($string_ =~ /$re_/) {
			if ($arch_ eq "AR") {



Reply to: