Add QA_CONFIGURE_OPTIONS variable.

diff --git a/bin/phase-functions.sh b/bin/phase-functions.sh
index 9de94363096155af92cb24b865f945e0f7ddfc57..5880f83c8cee9d459baaa8c0f14cbb00d2849c82 100644 (file)
--- a/bin/phase-functions.sh
+++ b/bin/phase-functions.sh
@@ -557,7 +557,8 @@ __dyn_install() {
        if [[ $CATEGORY != virtual ]] ; then
                for f in ASFLAGS CBUILD CC CFLAGS CHOST CTARGET CXX \
                        CXXFLAGS EXTRA_ECONF EXTRA_EINSTALL EXTRA_MAKE \
-                       LDFLAGS LIBCFLAGS LIBCXXFLAGS QA_DESKTOP_FILE ; do
+                       LDFLAGS LIBCFLAGS LIBCXXFLAGS QA_CONFIGURE_OPTIONS \
+                       QA_DESKTOP_FILE ; do
                        x=$(echo -n ${!f})
                        [[ -n $x ]] && echo "$x" > $f
                done

diff --git a/man/ebuild.5 b/man/ebuild.5
index cca00ddf051ff37950adf2217e5da84b06b66464..0045efd63554ad1e795105a89874be82a5db7e3a 100644 (file)
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -1,4 +1,4 @@
-.TH "EBUILD" "5" "Oct 2012" "Portage VERSION" "Portage"
+.TH "EBUILD" "5" "Dec 2012" "Portage VERSION" "Portage"
 
 .SH "NAME"
 ebuild \- the internal format, variables, and functions in an ebuild script
@@ -781,6 +781,11 @@ shared libraries that have SONAMEs but should not have a corresponding SONAME
 symlink in the same directory. The paths may contain regular expressions
 with escape\-quoted special characters.
 .TP
+.B QA_CONFIGURE_OPTIONS
+This should contain a list of configure options which trigger warnings about
+unrecognized options. The options may contain regular expressions with
+escape\-quoted special characters.
+.TP
 .B QA_DT_NEEDED
 This should contain a list of file paths, relative to the image directory, of
 shared libraries that lack NEEDED entries. The paths may contain regular

diff --git a/pym/portage/package/ebuild/doebuild.py b/pym/portage/package/ebuild/doebuild.py
index 880cdc4761dc10eb7fd07b4e7c757fa792f99119..a735ea81b3038fc1be722c946c17bb5eeb75a3e1 100644 (file)
--- a/pym/portage/package/ebuild/doebuild.py
+++ b/pym/portage/package/ebuild/doebuild.py
@@ -1579,7 +1579,29 @@ def _check_build_log(mysettings, out=None):
 
        configure_opts_warn = []
        configure_opts_warn_re = re.compile(
-               r'^configure: WARNING: [Uu]nrecognized options: ')
+               r'^configure: WARNING: [Uu]nrecognized options: (.*)')
+
+       qa_configure_opts = ""
+       try:
+               with io.open(_unicode_encode(os.path.join(
+                       mysettings["PORTAGE_BUILDDIR"],
+                       "build-info", "QA_CONFIGURE_OPTIONS"),
+                       encoding=_encodings['fs'], errors='strict'),
+                       mode='r', encoding=_encodings['repo.content'],
+                       errors='replace') as qa_configure_opts_f:
+                       qa_configure_opts = qa_configure_opts_f.read()
+       except IOError as e:
+               if e.errno not in (errno.ENOENT, errno.ESTALE):
+                       raise
+
+       qa_configure_opts = qa_configure_opts.split()
+       if qa_configure_opts:
+               if len(qa_configure_opts) > 1:
+                       qa_configure_opts = "|".join("(%s)" % x for x in qa_configure_opts)
+                       qa_configure_opts = "^(%s)$" % qa_configure_opts
+               else:
+                       qa_configure_opts = "^%s$" % qa_configure_opts[0]
+               qa_configure_opts = re.compile(qa_configure_opts)
 
        # Exclude output from dev-libs/yaz-3.0.47 which looks like this:
        #
@@ -1611,8 +1633,11 @@ def _check_build_log(mysettings, out=None):
                        if helper_missing_file_re.match(line) is not None:
                                helper_missing_file.append(line.rstrip("\n"))
 
-                       if configure_opts_warn_re.match(line) is not None:
-                               configure_opts_warn.append(line.rstrip("\n"))
+                       m = configure_opts_warn_re.match(line)
+                       if m is not None:
+                               for x in m.group(1).split(", "):
+                                       if not qa_configure_opts or qa_configure_opts.match(x) is None:
+                                               configure_opts_warn.append(x)
 
                        if make_jobserver_re.match(line) is not None:
                                make_jobserver.append(line.rstrip("\n"))
@@ -1661,7 +1686,7 @@ def _check_build_log(mysettings, out=None):
        if configure_opts_warn:
                msg = [_("QA Notice: Unrecognized configure options:")]
                msg.append("")
-               msg.extend("\t" + line for line in configure_opts_warn)
+               msg.extend("\t%s" % x for x in configure_opts_warn)
                _eqawarn(msg)
 
        if make_jobserver: