Advertisement
wellthatsucks

Untitled

Jan 23rd, 2019
180
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 2.33 KB | None | 0 0
  1. Megaport@DESKTOP-Q0H09QF MINGW64 /c/devel/gst-build/subprojects/win-flex-bison-binaries (master)
  2. $ git diff
  3. diff --git a/meson.build b/meson.build
  4. index 66dec30..02af00a 100644
  5. --- a/meson.build
  6. +++ b/meson.build
  7. @@ -55,10 +55,7 @@ os.symlink(os.path.join('@1@', 'subprojects', '@0@'),
  8. os.path.join('@1@', '@0@'))
  9. '''
  10.  
  11. -# On Windows, if flex/bison aren't found, we use a subproject to get them
  12. -flex = find_program('flex', 'win_flex', required : build_system != 'windows')
  13. -bison = find_program('bison', 'win_bison', required : build_system != 'windows')
  14. -if not flex.found() or not bison.found()
  15. +if build_system == 'windows'
  16. subproject('win-flex-bison-binaries')
  17. endif
  18.  
  19. diff --git a/subprojects/win-flex-bison-binaries/meson.build b/subprojects/win-flex-bison-binaries/meson.build
  20. index e56fea7..4179265 100644
  21. --- a/subprojects/win-flex-bison-binaries/meson.build
  22. +++ b/subprojects/win-flex-bison-binaries/meson.build
  23. @@ -1,25 +1,16 @@
  24. project('win-flex-bison-binary', version : '2.5.14')
  25.  
  26. -provide_flex = not find_program('flex', required : false).found()
  27. -provide_bison = not find_program('bison', required : false).found()
  28. +py3 = import('python3').find_python()
  29.  
  30. -if provide_flex or provide_bison
  31. - py3 = import('python3').find_python()
  32. +message('Downloading and extracting win-flex-bison binaries...')
  33.  
  34. - message('Downloading and extracting win-flex-bison binaries...')
  35. +zip_hash = '354c9aae02aca421c52abfda7fe3ce6c32ad07e25ff3f66e31da9437a0b906cf'
  36.  
  37. - zip_hash = '354c9aae02aca421c52abfda7fe3ce6c32ad07e25ff3f66e31da9437a0b906cf'
  38. -
  39. - ret = run_command(py3, files('download-binary.py'), meson.project_version(), zip_hash)
  40. - if ret.returncode() != 0
  41. - message(ret.stdout())
  42. - error(ret.stderr())
  43. - endif
  44. -
  45. - if provide_flex
  46. - meson.override_find_program('flex', find_program('win_flex'))
  47. - endif
  48. - if provide_bison
  49. - meson.override_find_program('bison', find_program('win_bison'))
  50. - endif
  51. +ret = run_command(py3, files('download-binary.py'), meson.project_version(), zip_hash)
  52. +if ret.returncode() != 0
  53. + message(ret.stdout())
  54. + error(ret.stderr())
  55. endif
  56. +
  57. +meson.override_find_program('flex', find_program('win_flex'))
  58. +meson.override_find_program('bison', find_program('win_bison'))
  59.  
  60. Megaport@DESKTOP-Q0H09QF MINGW64 /c/devel/gst-build/subprojects/win-flex-bison-binaries (master)
  61. $
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement