diff options
author | Peter Korsgaard <peter@korsgaard.com> | 2014-12-01 11:15:54 +0100 |
---|---|---|
committer | Peter Korsgaard <peter@korsgaard.com> | 2014-12-01 11:16:42 +0100 |
commit | fe1b2ef1d3236ffd36e0ec033566d45fcd9ba3fb (patch) | |
tree | fd6edbe93b19b167b105897e3de6a7c11eac4f9c /package/python-pyparsing/Config.in | |
parent | 9a5434fbfc98a0c427c880b167b8ca3499b44e87 (diff) | |
parent | 9b47f40bb29d9be34afabfb423bab0ad45cbc11f (diff) | |
download | buildroot-fe1b2ef1d3236ffd36e0ec033566d45fcd9ba3fb.tar.gz buildroot-fe1b2ef1d3236ffd36e0ec033566d45fcd9ba3fb.zip |
Merge branch 'next'
Conflicts:
Makefile
package/flac/0001-fix-altivec-logic.patch
package/grantlee/Config.in
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/python-pyparsing/Config.in')
-rw-r--r-- | package/python-pyparsing/Config.in | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/package/python-pyparsing/Config.in b/package/python-pyparsing/Config.in index 0408e5e44e..b926286cc4 100644 --- a/package/python-pyparsing/Config.in +++ b/package/python-pyparsing/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_PYPARSING bool "python-pyparsing" - depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 help The pyparsing module is an alternative approach to creating and executing simple grammars, vs. the traditional lex/yacc approach, |