From b345d2c75c0768ba8e58d75e69721d3b97564463 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Fri, 10 Nov 2023 20:25:49 +0000 Subject: Use the version of oniguruma distributed with jq --- setup.py | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 243dd2c..73f8b94 100644 --- a/setup.py +++ b/setup.py @@ -27,36 +27,19 @@ def _read(fname): jq_lib_tarball_path = _dep_source_path("jq-1.7.tar.gz") jq_lib_dir = _dep_build_path("jq-1.7") -oniguruma_version = "6.9.8" -oniguruma_lib_tarball_path = _dep_source_path("onig-{}.tar.gz".format(oniguruma_version)) -oniguruma_lib_build_dir = _dep_build_path("onig-{}".format(oniguruma_version)) -oniguruma_lib_install_dir = _dep_build_path("onig-install-{}".format(oniguruma_version)) - class jq_with_deps_build_ext(build_ext): def run(self): if not os.path.exists(_dep_build_path(".")): os.makedirs(_dep_build_path(".")) - self._build_oniguruma() self._build_libjq() build_ext.run(self) - def _build_oniguruma(self): - self._build_lib( - tarball_path=oniguruma_lib_tarball_path, - lib_dir=oniguruma_lib_build_dir, - commands=[ - ["./configure", "CFLAGS=-fPIC", "--prefix=" + oniguruma_lib_install_dir], - ["make"], - ["make", "install"], - ]) - - def _build_libjq(self): self._build_lib( tarball_path=jq_lib_tarball_path, lib_dir=jq_lib_dir, commands=[ - ["./configure", "CFLAGS=-fPIC -pthread", "--disable-maintainer-mode", "--with-oniguruma=" + oniguruma_lib_install_dir], + ["./configure", "CFLAGS=-fPIC -pthread", "--disable-maintainer-mode", "--with-oniguruma=builtin"], ["make"], ]) @@ -95,7 +78,7 @@ else: link_args_deps = [] extra_objects = [ os.path.join(jq_lib_dir, ".libs/libjq.a"), - os.path.join(oniguruma_lib_install_dir, "lib/libonig.a"), + os.path.join(jq_lib_dir, "modules/oniguruma/src/.libs/libonig.a"), ] -- cgit v1.2.3