[asterisk-bugs] [Asterisk 0016296]: [patch] menuselect.makeopts: does not properly unselect an option with a leading - (minus)

[Asterisk Bug Tracker]

A NOTE has been added to this issue. 
====================================================================== 
https://issues.asterisk.org/view.php?id=16296 
====================================================================== 
Reported By:                abelbeck
Assigned To:                qwell
====================================================================== 
Project:                    Asterisk
Issue ID:                   16296
Category:                   Core/BuildSystem
Reproducibility:            always
Severity:                   minor
Priority:                   normal
Status:                     closed
Target Version:             1.4.29
Asterisk Version:           SVN 
JIRA:                       SWP-450 
Regression:                 Yes 
Reviewboard Link:            
SVN Branch (only for SVN checkouts, not tarball releases): N/A 
SVN Revision (number only!):  
Request Review:              
Resolution:                 fixed
Fixed in Version:           
====================================================================== 
Date Submitted:             2009-11-20 15:41 CST
Last Modified:              2009-12-10 15:03 CST
====================================================================== 
Summary:                    [patch] menuselect.makeopts: does not properly
unselect an option with a leading - (minus)
Description: 
The main asterisk Makefile no longer contains the line:

.PHONY: menuselect.makeopts

So the section...
menuselect.makeopts: menuselect/menuselect menuselect-tree etc...
  menuselect/menuselect --check-deps $@ $(GLOBAL_MAKEOPTS)
$(USER_MAKEOPTS)

is now only called once.  The problem is if either GLOBAL_MAKEOPTS or
USER_MAKEOPTS contains an option to be un-selected from the default by
placing a - (minus) in front of the option, this no longer works.  (See
Additional Information)

My fix is to call menuselect/menuselect twice, first to create a default
menuselect.makeopts file and second to check/un-check any GLOBAL_MAKEOPTS
or USER_MAKEOPTS options relative to the default options.

menuselect.makeopts: menuselect/menuselect menuselect-tree etc...
  menuselect/menuselect --check-deps $@
  menuselect/menuselect --check-deps $@ $(GLOBAL_MAKEOPTS)
$(USER_MAKEOPTS)

This fix has been tested and works.
====================================================================== 

---------------------------------------------------------------------- 
 (0115103) svnbot (reporter) - 2009-12-10 15:03
 https://issues.asterisk.org/view.php?id=16296#c115103 
---------------------------------------------------------------------- 
Repository: asterisk
Revision: 234257

_U  branches/1.6.0/
U   branches/1.6.0/Makefile

------------------------------------------------------------------------
r234257 | qwell | 2009-12-10 15:02:59 -0600 (Thu, 10 Dec 2009) | 23 lines

Merged revisions 234256 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r234256 | qwell | 2009-12-10 15:01:39 -0600 (Thu, 10 Dec 2009) | 16
lines
  
  Merged revisions 234255 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r234255 | qwell | 2009-12-10 14:58:09 -0600 (Thu, 10 Dec 2009) | 9
lines
    
    Fix unselecting of menuselect options via GLOBAL_MAKEOPTS and
USER_MAKEOPTS.
    
    (closes issue https://issues.asterisk.org/view.php?id=16296)
    Reported by: abelbeck
    Patches:
          issue16296-20091210.diff uploaded by qwell (license 4)
    (abelbeck described a fix, which I expanded upon)
    Tested by: abelbeck, qwell, lmadsen
  ........
................

------------------------------------------------------------------------

http://svn.digium.com/view/asterisk?view=rev&revision=234257 

Issue History 
Date Modified    Username       Field                    Change               
====================================================================== 
2009-12-10 15:03 svnbot         Checkin                                      
2009-12-10 15:03 svnbot         Note Added: 0115103                          
======================================================================