Skip to content

Instantly share code, notes, and snippets.

@racko
Created August 12, 2017 21:20
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save racko/dab16d5313927065dafe83d08f975243 to your computer and use it in GitHub Desktop.
Save racko/dab16d5313927065dafe83d08f975243 to your computer and use it in GitHub Desktop.
catkin tools 4.4.4 GNU make 4.2 jobserver fix
diff -ura src/catkin_tools-0.4.4/catkin_tools/execution/job_server.py src2/catkin_tools-0.4.4/catkin_tools/execution/job_server.py
--- src/catkin_tools-0.4.4/catkin_tools/execution/job_server.py 2017-02-08 19:24:48.000000000 +0100
+++ src2/catkin_tools-0.4.4/catkin_tools/execution/job_server.py 2017-08-12 23:11:11.465047719 +0200
@@ -65,7 +65,7 @@
JOBSERVER_SUPPORT_MAKEFILE = b'''
all:
-\techo $(MAKEFLAGS) | grep -- '--jobserver-fds'
+\techo $(MAKEFLAGS) | grep -- '--jobserver-auth'
'''
@@ -73,7 +73,7 @@
"""
Test if the system 'make' supports the job server implementation.
- This simply checks if the `--jobserver-fds` option is supported by the
+ This simply checks if the `--jobserver-auth` option is supported by the
`make` command. It does not tests if the jobserver is actually working
properly.
"""
@@ -407,7 +407,7 @@
"""
if gnu_make_enabled():
- return ["--jobserver-fds=%d,%d" % JobServer._job_pipe, "-j"]
+ return ["--jobserver-auth=%d,%d" % JobServer._job_pipe]
else:
return []
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment