From 6fbe9678689aafd476dd118f18e665cb7a71ebd7 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Mon, 10 Aug 2015 20:25:59 +0100 Subject: Update link to source tarball, which now requires autoconf to build --- README.rst | 8 +++++--- setup.py | 5 +++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/README.rst b/README.rst index 9b68d4e..bed353e 100644 --- a/README.rst +++ b/README.rst @@ -12,6 +12,8 @@ the source for jq 1.4 is downloaded over HTTPS and built. Therefore, installation requires any programs required to build jq. This includes: +* Autoreconf + * The normal C compiler toolchain, such as gcc and make. * Flex @@ -29,7 +31,7 @@ If on Debian, Ubuntu or relatives, running the following command should be suffi .. code-block:: sh - apt-get install build-essential flex bison libtool python-dev + apt-get install autoconf build-essential flex bison libtool python-dev Red Hat, Fedora, CentOS or relatives ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -39,7 +41,7 @@ If on Red Hat, Fedora, CentOS, or relatives, running the following command shoul .. code-block:: sh yum groupinstall "Development Tools" - yum install flex bison libtool python + yum install autoconf flex bison libtool python Mac OS X ~~~~~~~~ @@ -50,7 +52,7 @@ Once Homebrew is installed, you can install the remaining dependencies with: .. code-block:: sh - brew install bison libtool + brew install autoconf bison libtool Note that at least some versions of Mac OS X ship a version of ``bison`` that is too old for ``jq`` to use. jq.py will try to use the version from Homebrew if available. diff --git a/setup.py b/setup.py index d77512d..36bf4e9 100644 --- a/setup.py +++ b/setup.py @@ -29,13 +29,13 @@ def read(fname): tarball_path = path_in_dir("_jq-lib-1.4.tar.gz") -jq_lib_dir = path_in_dir("jq-1.4") +jq_lib_dir = path_in_dir("jq-jq-1.4") class jq_build_ext(build_ext): def run(self): if os.path.exists(tarball_path): os.unlink(tarball_path) - urlretrieve("https://stedolan.github.io/jq/download/source/jq-1.4.tar.gz", tarball_path) + urlretrieve("https://github.com/stedolan/jq/archive/jq-1.4.tar.gz", tarball_path) if os.path.exists(jq_lib_dir): shutil.rmtree(jq_lib_dir) @@ -65,6 +65,7 @@ class jq_build_ext(build_ext): if macosx_deployment_target: os.environ['MACOSX_DEPLOYMENT_TARGET'] = macosx_deployment_target + command(["autoreconf", "-i"]) command(["./configure"] + configure_args) command(["make"]) -- cgit v1.2.3