From 75dec43f2c32292f4c788d8e4fa845d2cbaeaa51 Mon Sep 17 00:00:00 2001 From: Jason Stubbs Date: Fri, 27 Jan 2006 04:50:09 +0000 Subject: Add support for EMERGE_DEFAULT_OPTS configuration variable for setting options that emerge always considers to be specified. svn path=/main/trunk/; revision=2588 --- bin/emerge | 4 ++-- cnf/make.conf | 6 ++++++ cnf/make.conf.alpha | 6 ++++++ cnf/make.conf.amd64 | 6 ++++++ cnf/make.conf.arm | 6 ++++++ cnf/make.conf.hppa | 6 ++++++ cnf/make.conf.ia64 | 6 ++++++ cnf/make.conf.mips | 6 ++++++ cnf/make.conf.ppc | 6 ++++++ cnf/make.conf.ppc64 | 6 ++++++ cnf/make.conf.s390 | 6 ++++++ cnf/make.conf.sparc | 6 ++++++ cnf/make.conf.x86 | 6 ++++++ cnf/make.conf.x86-fbsd | 6 ++++++ man/make.conf.5 | 3 +++ 15 files changed, 83 insertions(+), 2 deletions(-) diff --git a/bin/emerge b/bin/emerge index 82915725d..a41b372a9 100755 --- a/bin/emerge +++ b/bin/emerge @@ -222,7 +222,7 @@ edebug=0 # process short actions tmpcmdline=sys.argv[1:] -#tmpcmdline.extend(portage.settings["EMERGE_OPTS"].split()) +tmpcmdline.extend(portage.settings["EMERGE_DEFAULT_OPTS"].split()) cmdline=[] for x in tmpcmdline: if x[0:1]=="-" and x[1:2]!="-": @@ -3025,7 +3025,7 @@ elif "info"==myaction: myvars = ['GENTOO_MIRRORS', 'CONFIG_PROTECT', 'CONFIG_PROTECT_MASK', 'PORTDIR', 'DISTDIR', 'PKGDIR', 'PORTAGE_TMPDIR', 'PORTDIR_OVERLAY', 'USE', 'CHOST', 'CFLAGS', 'CXXFLAGS', - 'ACCEPT_KEYWORDS', 'SYNC', 'FEATURES'] + 'ACCEPT_KEYWORDS', 'SYNC', 'FEATURES', 'EMERGE_DEFAULT_OPTS'] myvars.extend(portage_util.grabfile(portage.settings["PORTDIR"]+"/profiles/info_vars")) diff --git a/cnf/make.conf b/cnf/make.conf index fb2cad1e8..9c23f09d0 100644 --- a/cnf/make.conf +++ b/cnf/make.conf @@ -222,6 +222,12 @@ CHOST="i686-pc-linux-gnu" # Advanced Features # ================= # +# EMERGE_DEFAULT_OPTS allows emerge to act as if certain options are +# specified on every run. Useful options include --ask, --verbose, +# --usepkg and many others. Options that are not useful, such as --help, +# are not filtered. +#EMERGE_DEFAULT_OPTS="" +# # MAKEOPTS provides extra options that may be passed to 'make' when a # program is compiled. Presently the only use is for specifying # the number of parallel makes (-j) to perform. The suggested number diff --git a/cnf/make.conf.alpha b/cnf/make.conf.alpha index 32cba977c..b08342ba2 100644 --- a/cnf/make.conf.alpha +++ b/cnf/make.conf.alpha @@ -208,6 +208,12 @@ CFLAGS="-mcpu=ev5 -O3 -pipe " # Advanced Features # ================= # +# EMERGE_DEFAULT_OPTS allows emerge to act as if certain options are +# specified on every run. Useful options include --ask, --verbose, +# --usepkg and many others. Options that are not useful, such as --help, +# are not filtered. +#EMERGE_DEFAULT_OPTS="" +# # MAKEOPTS provides extra options that may be passed to 'make' when a # program is compiled. Presently the only use is for specifying # the number of parallel makes (-j) to perform. The suggested number diff --git a/cnf/make.conf.amd64 b/cnf/make.conf.amd64 index f2de1cef3..caff3c59e 100644 --- a/cnf/make.conf.amd64 +++ b/cnf/make.conf.amd64 @@ -219,6 +219,12 @@ CHOST="x86_64-pc-linux-gnu" # Advanced Features # ================= # +# EMERGE_DEFAULT_OPTS allows emerge to act as if certain options are +# specified on every run. Useful options include --ask, --verbose, +# --usepkg and many others. Options that are not useful, such as --help, +# are not filtered. +#EMERGE_DEFAULT_OPTS="" +# # MAKEOPTS provides extra options that may be passed to 'make' when a # program is compiled. Presently the only use is for specifying # the number of parallel makes (-j) to perform. The suggested number diff --git a/cnf/make.conf.arm b/cnf/make.conf.arm index 3f07565c2..34ca3990a 100644 --- a/cnf/make.conf.arm +++ b/cnf/make.conf.arm @@ -216,6 +216,12 @@ CHOST="armv4l-unknown-linux-gnu" # Advanced Features # ================= # +# EMERGE_DEFAULT_OPTS allows emerge to act as if certain options are +# specified on every run. Useful options include --ask, --verbose, +# --usepkg and many others. Options that are not useful, such as --help, +# are not filtered. +#EMERGE_DEFAULT_OPTS="" +# # MAKEOPTS provides extra options that may be passed to 'make' when a # program is compiled. Presently the only use is for specifying # the number of parallel makes (-j) to perform. The suggested number diff --git a/cnf/make.conf.hppa b/cnf/make.conf.hppa index 6f948642a..9241bcc3b 100644 --- a/cnf/make.conf.hppa +++ b/cnf/make.conf.hppa @@ -225,6 +225,12 @@ CHOST="hppa-unknown-linux-gnu" # Advanced Features # ================= # +# EMERGE_DEFAULT_OPTS allows emerge to act as if certain options are +# specified on every run. Useful options include --ask, --verbose, +# --usepkg and many others. Options that are not useful, such as --help, +# are not filtered. +#EMERGE_DEFAULT_OPTS="" +# # MAKEOPTS provides extra options that may be passed to 'make' when a # program is compiled. Presently the only use is for specifying # the number of parallel makes (-j) to perform. The suggested number diff --git a/cnf/make.conf.ia64 b/cnf/make.conf.ia64 index 81f6a29a8..7de834833 100644 --- a/cnf/make.conf.ia64 +++ b/cnf/make.conf.ia64 @@ -187,6 +187,12 @@ CHOST="ia64-unknown-linux-gnu" # Advanced Features # ================= # +# EMERGE_DEFAULT_OPTS allows emerge to act as if certain options are +# specified on every run. Useful options include --ask, --verbose, +# --usepkg and many others. Options that are not useful, such as --help, +# are not filtered. +#EMERGE_DEFAULT_OPTS="" +# # MAKEOPTS provides extra options that may be passed to 'make' when a # program is compiled. Presently the only use is for specifying # the number of parallel makes (-j) to perform. The suggested number diff --git a/cnf/make.conf.mips b/cnf/make.conf.mips index d63369da6..c0834b019 100644 --- a/cnf/make.conf.mips +++ b/cnf/make.conf.mips @@ -205,6 +205,12 @@ CHOST="mips-unknown-linux-gnu" # Advanced Features # ================= # +# EMERGE_DEFAULT_OPTS allows emerge to act as if certain options are +# specified on every run. Useful options include --ask, --verbose, +# --usepkg and many others. Options that are not useful, such as --help, +# are not filtered. +#EMERGE_DEFAULT_OPTS="" +# # MAKEOPTS provides extra options that may be passed to 'make' when a # program is compiled. Presently the only use is for specifying # the number of parallel makes (-j) to perform. The suggested number diff --git a/cnf/make.conf.ppc b/cnf/make.conf.ppc index d15bc999e..922536f6d 100644 --- a/cnf/make.conf.ppc +++ b/cnf/make.conf.ppc @@ -245,6 +245,12 @@ CHOST="powerpc-unknown-linux-gnu" # Advanced Features # ================= # +# EMERGE_DEFAULT_OPTS allows emerge to act as if certain options are +# specified on every run. Useful options include --ask, --verbose, +# --usepkg and many others. Options that are not useful, such as --help, +# are not filtered. +#EMERGE_DEFAULT_OPTS="" +# # MAKEOPTS provides extra options that may be passed to 'make' when a # program is compiled. Presently the only use is for specifying # the number of parallel makes (-j) to perform. The suggested number diff --git a/cnf/make.conf.ppc64 b/cnf/make.conf.ppc64 index 35becf4ec..2da0e6049 100644 --- a/cnf/make.conf.ppc64 +++ b/cnf/make.conf.ppc64 @@ -229,6 +229,12 @@ CHOST="powerpc64-unknown-linux-gnu" # Advanced Features # ================= # +# EMERGE_DEFAULT_OPTS allows emerge to act as if certain options are +# specified on every run. Useful options include --ask, --verbose, +# --usepkg and many others. Options that are not useful, such as --help, +# are not filtered. +#EMERGE_DEFAULT_OPTS="" +# # MAKEOPTS provides extra options that may be passed to 'make' when a # program is compiled. Presently the only use is for specifying # the number of parallel makes (-j) to perform. The suggested number diff --git a/cnf/make.conf.s390 b/cnf/make.conf.s390 index fca5c058f..ad8097d2e 100644 --- a/cnf/make.conf.s390 +++ b/cnf/make.conf.s390 @@ -187,6 +187,12 @@ CHOST="s390-ibm-linux-gnu" # Advanced Features # ================= # +# EMERGE_DEFAULT_OPTS allows emerge to act as if certain options are +# specified on every run. Useful options include --ask, --verbose, +# --usepkg and many others. Options that are not useful, such as --help, +# are not filtered. +#EMERGE_DEFAULT_OPTS="" +# # MAKEOPTS provides extra options that may be passed to 'make' when a # program is compiled. Presently the only use is for specifying # the number of parallel makes (-j) to perform. The suggested number diff --git a/cnf/make.conf.sparc b/cnf/make.conf.sparc index b91446bf6..e1ab499d6 100644 --- a/cnf/make.conf.sparc +++ b/cnf/make.conf.sparc @@ -223,6 +223,12 @@ # Advanced Features # ================= # +# EMERGE_DEFAULT_OPTS allows emerge to act as if certain options are +# specified on every run. Useful options include --ask, --verbose, +# --usepkg and many others. Options that are not useful, such as --help, +# are not filtered. +#EMERGE_DEFAULT_OPTS="" +# # MAKEOPTS provides extra options that may be passed to 'make' when a # program is compiled. Presently the only use is for specifying # the number of parallel makes (-j) to perform. The suggested number diff --git a/cnf/make.conf.x86 b/cnf/make.conf.x86 index 4c769dbf7..d98231eda 100644 --- a/cnf/make.conf.x86 +++ b/cnf/make.conf.x86 @@ -222,6 +222,12 @@ CHOST="i686-pc-linux-gnu" # Advanced Features # ================= # +# EMERGE_DEFAULT_OPTS allows emerge to act as if certain options are +# specified on every run. Useful options include --ask, --verbose, +# --usepkg and many others. Options that are not useful, such as --help, +# are not filtered. +#EMERGE_DEFAULT_OPTS="" +# # MAKEOPTS provides extra options that may be passed to 'make' when a # program is compiled. Presently the only use is for specifying # the number of parallel makes (-j) to perform. The suggested number diff --git a/cnf/make.conf.x86-fbsd b/cnf/make.conf.x86-fbsd index 115aca554..1149e4161 100644 --- a/cnf/make.conf.x86-fbsd +++ b/cnf/make.conf.x86-fbsd @@ -222,6 +222,12 @@ CHOST="i686-unknown-freebsd5.3" # Advanced Features # ================= # +# EMERGE_DEFAULT_OPTS allows emerge to act as if certain options are +# specified on every run. Useful options include --ask, --verbose, +# --usepkg and many others. Options that are not useful, such as --help, +# are not filtered. +#EMERGE_DEFAULT_OPTS="" +# # MAKEOPTS provides extra options that may be passed to 'make' when a # program is compiled. Presently the only use is for specifying # the number of parallel makes (-j) to perform. The suggested number diff --git a/man/make.conf.5 b/man/make.conf.5 index 2ae9278b2..82f79d9df 100644 --- a/man/make.conf.5 +++ b/man/make.conf.5 @@ -98,6 +98,9 @@ Defaults to ${PORTDIR}/distfiles. Defines whether or not to ignore audible beeps when displaying important informational messages. This variable is unset by default. .TP +.B EMERGE_DEFAULT_OPTS +Options to append to the end of the emerge command line on every invocation. +.TP .B EPAUSE_IGNORE Defines whether or not to ignore short pauses that occur when displaying important informational messages. This variable is unset by default. -- cgit v1.2.3-1-g7c22