diff options
| author |   sthen <sthen@openbsd.org> | 2015-06-25 13:33:25 +0000 |
|---|---|---|
| committer | sthen <sthen@openbsd.org> | 2015-06-25 13:33:25 +0000 |
| commit | 456a9e55536641981faacacaa9f48f3575b50a5d (patch) | |
| tree | 1133142b0a06fe6d6c4fd5949556be2b347ddc09 | |
| parent | Re-enable memory above 256mb now that uvm_pmr_get1page() has been fixed. (diff) | |
| download | wireguard-openbsd-456a9e55536641981faacacaa9f48f3575b50a5d.tar.xz wireguard-openbsd-456a9e55536641981faacacaa9f48f3575b50a5d.zip | |
use machine_architecture (arch -s) when assembling PKG_PATHs using %m or %a,
fixes these variables with arch like powerpc where this differs from "uname -m".
reported by/ok aja@
| -rw-r--r-- | usr.sbin/pkg_add/OpenBSD/PackageRepository/Installed.pm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/PackageRepository/Installed.pm b/usr.sbin/pkg_add/OpenBSD/PackageRepository/Installed.pm index 4326816b420..4a3eadafd31 100644 --- a/usr.sbin/pkg_add/OpenBSD/PackageRepository/Installed.pm +++ b/usr.sbin/pkg_add/OpenBSD/PackageRepository/Installed.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: Installed.pm,v 1.32 2015/04/16 14:08:19 espie Exp $ +# $OpenBSD: Installed.pm,v 1.33 2015/06/25 13:33:25 sthen Exp $ # # Copyright (c) 2007-2014 Marc Espie <espie@openbsd.org> # @@ -33,7 +33,7 @@ sub expand_locations my ($class, $string, $state) = @_; require OpenBSD::Paths; if ($string eq '%a') { - return OpenBSD::Paths->architecture; + return OpenBSD::Paths->machine_architecture; } elsif ($string eq '%v') { return OpenBSD::Paths->os_version; } elsif ($string eq '%c') { @@ -43,7 +43,7 @@ sub expand_locations 'pub/OpenBSD', OpenBSD::Paths->os_directory, 'packages', - OpenBSD::Paths->architecture); + OpenBSD::Paths->machine_architecture); } } |