diff options
| author | Nicolás Reynolds <apoyosis@correo.inta.gob.ar> | 2012-04-12 13:53:12 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <apoyosis@correo.inta.gob.ar> | 2012-04-12 13:53:12 -0300 |
| commit | a0a5078595f0fc0826387582bb0e76cb52908518 (patch) | |
| tree | 8d8155b80f925068f69ee4aea606a9f24d890aeb /libre/dpkg/dpkg-arch.patch | |
| parent | a19cbf2e94f0c06adafec2a9ff0d1d619881cc83 (diff) | |
| parent | 96df1bacd54ae9d919c62f4348cc011c961f923e (diff) | |
Merge branch 'master' of ssh://gparabola/abslibre
Conflicts:
libre/file-roller-libre/PKGBUILD
Diffstat (limited to 'libre/dpkg/dpkg-arch.patch')
| -rw-r--r-- | libre/dpkg/dpkg-arch.patch | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/libre/dpkg/dpkg-arch.patch b/libre/dpkg/dpkg-arch.patch new file mode 100644 index 000000000..66e7a2ef2 --- /dev/null +++ b/libre/dpkg/dpkg-arch.patch @@ -0,0 +1,17 @@ +diff -ru dpkg-1.16.2.orig/scripts/Dpkg/Arch.pm dpkg-1.16.2/scripts/Dpkg/Arch.pm +--- dpkg-1.16.2.orig/scripts/Dpkg/Arch.pm 2012-03-19 02:40:08.000000000 -0400 ++++ dpkg-1.16.2/scripts/Dpkg/Arch.pm 2012-04-02 16:14:55.000000000 -0400 +@@ -49,12 +49,7 @@ + { + return $build_arch if defined $build_arch; + +- # Note: We *always* require an installed dpkg when inferring the +- # build architecture. The bootstrapping case is handled by +- # dpkg-architecture itself, by avoiding computing the DEB_BUILD_ +- # variables when they are not requested. +- +- my $build_arch = `dpkg --print-architecture`; ++ my $build_arch = `uname -m`; + syserr("dpkg --print-architecture failed") if $? >> 8; + + chomp $build_arch; |