diff options
| author | joerg <joerg@pkgsrc.org> | 2008-01-26 23:30:24 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2008-01-26 23:30:24 +0000 |
| commit | 6c75749a5689582c40265e3b335d2afb48ecd76a (patch) | |
| tree | 9a81f8f25759a7ee974090d262058c0bd5eba24e /pkgtools | |
| parent | 5a3a1a525a79aa190f2bef2ad6160f25cd072af8 (diff) | |
| download | pkgsrc-6c75749a5689582c40265e3b335d2afb48ecd76a.tar.gz | |
pkg_install-20080126: Make pkg_add pass down -I and -m when recursively
adding packages.
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/pkg_install/files/add/perform.c | 7 | ||||
| -rw-r--r-- | pkgtools/pkg_install/files/lib/version.h | 4 |
2 files changed, 7 insertions, 4 deletions
diff --git a/pkgtools/pkg_install/files/add/perform.c b/pkgtools/pkg_install/files/add/perform.c index ac1867955d0..a0b116d86ac 100644 --- a/pkgtools/pkg_install/files/add/perform.c +++ b/pkgtools/pkg_install/files/add/perform.c @@ -1,4 +1,4 @@ -/* $NetBSD: perform.c,v 1.68 2007/11/30 00:30:39 rillig Exp $ */ +/* $NetBSD: perform.c,v 1.69 2008/01/26 23:30:24 joerg Exp $ */ #if HAVE_CONFIG_H #include "config.h" @@ -14,7 +14,7 @@ #if 0 static const char *rcsid = "from FreeBSD Id: perform.c,v 1.44 1997/10/13 15:03:46 jkh Exp"; #else -__RCSID("$NetBSD: perform.c,v 1.68 2007/11/30 00:30:39 rillig Exp $"); +__RCSID("$NetBSD: perform.c,v 1.69 2008/01/26 23:30:24 joerg Exp $"); #endif #endif @@ -191,6 +191,9 @@ installprereq(const char *name, int *errc, int doupdate) Force ? "-f" : "", Prefix ? "-p" : "", Prefix ? Prefix : "", Verbose ? "-v" : "", + OverrideMachine ? "-m" : "", + OverrideMachine ? OverrideMachine : "", + NoInstall ? "-I" : "", "-A", name, NULL)) { warnx("autoload of dependency `%s' failed%s", name, Force ? " (proceeding anyway)" : "!"); diff --git a/pkgtools/pkg_install/files/lib/version.h b/pkgtools/pkg_install/files/lib/version.h index 5595b7c6b8c..9a19fb5a274 100644 --- a/pkgtools/pkg_install/files/lib/version.h +++ b/pkgtools/pkg_install/files/lib/version.h @@ -1,4 +1,4 @@ -/* $NetBSD: version.h,v 1.87 2007/12/23 23:58:27 joerg Exp $ */ +/* $NetBSD: version.h,v 1.88 2008/01/26 23:30:24 joerg Exp $ */ /* * Copyright (c) 2001 Thomas Klausner. All rights reserved. @@ -33,6 +33,6 @@ #ifndef _INST_LIB_VERSION_H_ #define _INST_LIB_VERSION_H_ -#define PKGTOOLS_VERSION "20071224" +#define PKGTOOLS_VERSION "20080126" #endif /* _INST_LIB_VERSION_H_ */ |