diff options
| author | Peter Wu <peter@lekensteyn.nl> | 2019-06-22 19:42:11 +0100 |
|---|---|---|
| committer | Peter Wu <peter@lekensteyn.nl> | 2019-06-23 17:31:15 +0000 |
| commit | 7dfcb4425adf29590f3daf507d667b330a97b669 (patch) | |
| tree | 324aa6db35f15b2689b42a7205dd83bdbccaeb1a /debian | |
| parent | 99a87a68caf83eec37ac83ba7a8c3c6a051ff68e (diff) | |
asn2wrs: use system lex and yacc from ply if available
Tested with python-ply 3.11 and Python 3.7.3 on Arch Linux using the
'ninja asn1' command.
Bundling lex.py and yacc.py is one distribution method suggested by PLY
upstream (https://www.dabeaz.com/ply/README.txt), but since it is also
available in many Linux distributions, we could potentially remove it in
the future. Windows developers can install it through pip if needed.
Change-Id: I9c847072916ee33da49994820b435ec1d7110303
Reviewed-on: https://code.wireshark.org/review/33708
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/patches/04_asn2wrs_ply.patch | 18 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
2 files changed, 0 insertions, 19 deletions
diff --git a/debian/patches/04_asn2wrs_ply.patch b/debian/patches/04_asn2wrs_ply.patch deleted file mode 100644 index bc700467c6..0000000000 --- a/debian/patches/04_asn2wrs_ply.patch +++ /dev/null @@ -1,18 +0,0 @@ -Description: Use lex/yacc from ply -Forwarded: not-needed -Bug-Debian: http://bugs.debian.org/554613 -Author: Jakub Wilk <ubanus@users.sf.net> - ---- a/tools/asn2wrs.py -+++ b/tools/asn2wrs.py -@@ -70,8 +70,8 @@ - import getopt - import traceback - --import lex --import yacc -+from ply import lex -+from ply import yacc - - if sys.version_info[0] < 3: - from string import maketrans diff --git a/debian/patches/series b/debian/patches/series index 0cf27e2a5e..07c543b0a4 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,2 @@ -04_asn2wrs_ply.patch 09_idl2wrs.patch 16_licence_about_location.patch |