• Michael Witten's avatar
    perf tools: Revert regression in configuration of Python support · a363a9da
    Michael Witten authored
    Among other things, the following:
    
      commit 31160d7f
      Date:   Tue Jan 8 16:22:36 2013 -0500
      perf tools: Fix GNU make v3.80 compatibility issue
    
    attempts to aid the user by tapping into an existing error message,
    as described in the commit message:
    
      ... Also fix an issue where _get_attempt was called with only
      one argument. This prevented the error message from printing
      the name of the variable that can be used to fix the problem.
    
    or more precisely:
    
      -$(if $($(1)),$(call _ge_attempt,$($(1)),$(1)),$(call _ge_attempt,$(2)))
      +$(if $($(1)),$(call _ge_attempt,$($(1)),$(1)),$(call _ge_attempt,$(2),$(1)))
    
    However, The "missing" argument was in fact missing on purpose; it's
    absence is a signal that the error message should be skipped, because
    the failure would be due to the default value, not any user-supplied
    value.  This can be seen in how `_ge_attempt' uses `gea_err' (in the
    config/utilities.mak file):
    
      _ge_attempt = $(if $(get-executable),$(get-executable),$(_gea_warn)$(call _gea_err,$(2)))
      _gea_warn = $(warning The path '$(1)' is not executable.)
      _gea_err  = $(if $(1),$(error Please set '$(1)' appropriately))
    
    That is, because the argument is no longer missing, the value `$(1)'
    (associated with `_gea_err') always evaluates to true, thus always
    triggering the error condition that is meant to be reserved for
    only the case when a user explicitly supplies an invalid value.
    
    Concretely, the result is a regression in the Makefile's configuration
    of python support; rather than gracefully disable support when the
    relevant executables cannot be found according to default values, the
    build process halts in error as though the user explicitly supplied
    the values.
    
    This new commit simply reverts the offending one-line change.
    Reported-by: default avatarPekka Enberg <penberg@kernel.org>
    Link: http://lkml.kernel.org/r/CAOJsxLHv17Ys3M7P5q25imkUxQW6LE_vABxh1N3Tt7Mv6Ho4iw@mail.gmail.comSigned-off-by: default avatarMichael Witten <mfwitten@gmail.com>
    a363a9da
utilities.mak 5.61 KB