summaryrefslogtreecommitdiff
path: root/setup.py
diff options
context:
space:
mode:
authorMichael Williamson <mike@zwobble.org>2013-06-28 17:12:39 +0100
committerMichael Williamson <mike@zwobble.org>2013-06-28 17:12:39 +0100
commitcbfbd9be6b47a5822a3b3cd5ec9f19a82496630e (patch)
tree3980f6b090f2ab92774d1629f8c3bbb568453b16 /setup.py
parentbf0f12612e0d867801ef6ba34b78d6f1c14bbf05 (diff)
Update to work with libjq branch on github.com/stedolan/jq
Diffstat (limited to 'setup.py')
-rw-r--r--setup.py9
1 files changed, 5 insertions, 4 deletions
diff --git a/setup.py b/setup.py
index 130090a..8b5e695 100644
--- a/setup.py
+++ b/setup.py
@@ -28,11 +28,11 @@ class jq_build_ext(build_ext):
else:
subprocess.check_call([
"git", "clone",
- "https://github.com/nicowilliams/jq.git",
+ "https://github.com/stedolan/jq.git",
jq_lib_dir
])
- # Tested with commit e8643787cf
+ # Tested with commit 37cfc912c1
command(["git", "checkout", "libjq"])
command(["mkdir", "-p", "m4"])
command(["autoreconf", "-i"])
@@ -47,8 +47,9 @@ jq_extension = Extension(
"jq",
sources=["jq.c"],
include_dirs=[jq_lib_dir],
- libraries=["jq"],
- library_dirs=[jq_lib_dir],
+ #libraries=["jq"],
+ extra_objects=[os.path.join(jq_lib_dir, ".libs/libjq.a")],
+ #library_dirs=[os.path.join(jq_lib_dir, ".libs")],
)
setup(