summaryrefslogtreecommitdiff
path: root/setup.py
diff options
context:
space:
mode:
authorMichael Williamson <mike@zwobble.org>2013-09-15 17:11:05 +0100
committerMichael Williamson <mike@zwobble.org>2013-09-15 17:11:05 +0100
commita54895c0f3160fa3e2732d4b497c550b346aef6b (patch)
treef71e13c026f2a90bbc09e1814e980d20e5846cdc /setup.py
parent2ee14d9f003173df36bcb143cfee44f2e759dd2c (diff)
Use master branch of jq
Diffstat (limited to 'setup.py')
-rw-r--r--setup.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/setup.py b/setup.py
index 99ebe5a..aa912bd 100644
--- a/setup.py
+++ b/setup.py
@@ -28,16 +28,16 @@ class jq_build_ext(build_ext):
subprocess.check_call(args, cwd=path_in_dir(jq_lib_dir))
if os.path.exists(jq_lib_dir):
- command(["git", "fetch"])
+ command(["git", "checkout", "master"])
+ command(["git", "pull"])
else:
subprocess.check_call([
"git", "clone",
"https://github.com/stedolan/jq.git",
jq_lib_dir
])
+ command(["git", "checkout", "master"])
- # Tested with commit 37cfc912c1
- command(["git", "checkout", "libjq"])
command(["mkdir", "-p", "m4"])
command(["autoreconf", "-i"])
command(["./configure", "CFLAGS=-fPIC"])