mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-15 00:54:46 +00:00
bac4d95aa2
Lots of URLs were HTTP redirect to HTTPS. Changed those and checked them if there's actual content. Inspired by https://github.com/NixOS/nixpkgs/issues/60004
131 lines
3.9 KiB
Diff
131 lines
3.9 KiB
Diff
From 3f369cf8b9f7134d0792f6b141d39b5342a8274f Mon Sep 17 00:00:00 2001
|
|
From: Benjamin Staffin <benley@gmail.com>
|
|
Date: Mon, 14 Jan 2019 17:27:06 -0500
|
|
Subject: [PATCH] Vastly simplify setup.py for distro compatibility
|
|
|
|
---
|
|
setup.py | 81 +-------------------------------------------------------
|
|
1 file changed, 1 insertion(+), 80 deletions(-)
|
|
|
|
diff --git a/setup.py b/setup.py
|
|
index 77933f2..2b71e25 100644
|
|
--- a/setup.py
|
|
+++ b/setup.py
|
|
@@ -1,10 +1,6 @@
|
|
#!/usr/bin/env python
|
|
|
|
import os
|
|
-import platform
|
|
-import subprocess
|
|
-import tarfile
|
|
-import shutil
|
|
|
|
try:
|
|
import sysconfig
|
|
@@ -14,88 +10,15 @@ except ImportError:
|
|
|
|
from setuptools import setup
|
|
from distutils.extension import Extension
|
|
-from distutils.command.build_ext import build_ext
|
|
-
|
|
-try:
|
|
- from urllib import urlretrieve
|
|
-except ImportError:
|
|
- from urllib.request import urlretrieve
|
|
-
|
|
-def path_in_dir(relative_path):
|
|
- return os.path.abspath(os.path.join(os.path.dirname(__file__), relative_path))
|
|
|
|
def read(fname):
|
|
return open(os.path.join(os.path.dirname(__file__), fname)).read()
|
|
|
|
|
|
-jq_lib_tarball_path = path_in_dir("_jq-lib-1.5.tar.gz")
|
|
-jq_lib_dir = path_in_dir("jq-jq-1.5")
|
|
-
|
|
-oniguruma_lib_tarball_path = path_in_dir("_onig-5.9.6.tar.gz")
|
|
-oniguruma_lib_build_dir = path_in_dir("onig-5.9.6")
|
|
-oniguruma_lib_install_dir = path_in_dir("onig-install-5.9.6")
|
|
-
|
|
-class jq_build_ext(build_ext):
|
|
- def run(self):
|
|
- self._build_oniguruma()
|
|
- self._build_libjq()
|
|
- build_ext.run(self)
|
|
-
|
|
- def _build_oniguruma(self):
|
|
- self._build_lib(
|
|
- source_url="https://github.com/kkos/oniguruma/releases/download/v5.9.6/onig-5.9.6.tar.gz",
|
|
- 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(
|
|
- source_url="https://github.com/stedolan/jq/archive/jq-1.5.tar.gz",
|
|
- tarball_path=jq_lib_tarball_path,
|
|
- lib_dir=jq_lib_dir,
|
|
- commands=[
|
|
- ["autoreconf", "-i"],
|
|
- ["./configure", "CFLAGS=-fPIC", "--disable-maintainer-mode", "--with-oniguruma=" + oniguruma_lib_install_dir],
|
|
- ["make"],
|
|
- ])
|
|
-
|
|
- def _build_lib(self, source_url, tarball_path, lib_dir, commands):
|
|
- self._download_tarball(source_url, tarball_path)
|
|
-
|
|
- macosx_deployment_target = sysconfig.get_config_var("MACOSX_DEPLOYMENT_TARGET")
|
|
- if macosx_deployment_target:
|
|
- os.environ['MACOSX_DEPLOYMENT_TARGET'] = macosx_deployment_target
|
|
-
|
|
- def run_command(args):
|
|
- print("Executing: %s" % ' '.join(args))
|
|
- subprocess.check_call(args, cwd=lib_dir)
|
|
-
|
|
- for command in commands:
|
|
- run_command(command)
|
|
-
|
|
- def _download_tarball(self, source_url, tarball_path):
|
|
- if os.path.exists(tarball_path):
|
|
- os.unlink(tarball_path)
|
|
- urlretrieve(source_url, tarball_path)
|
|
-
|
|
- if os.path.exists(jq_lib_dir):
|
|
- shutil.rmtree(jq_lib_dir)
|
|
- tarfile.open(tarball_path, "r:gz").extractall(path_in_dir("."))
|
|
-
|
|
-
|
|
jq_extension = Extension(
|
|
"jq",
|
|
sources=["jq.c"],
|
|
- include_dirs=[jq_lib_dir],
|
|
- extra_objects=[
|
|
- os.path.join(jq_lib_dir, ".libs/libjq.a"),
|
|
- os.path.join(oniguruma_lib_install_dir, "lib/libonig.a"),
|
|
- ],
|
|
+ libraries=["jq"],
|
|
)
|
|
|
|
setup(
|
|
@@ -107,7 +30,6 @@ setup(
|
|
url='https://github.com/mwilliamson/jq.py',
|
|
license='BSD 2-Clause',
|
|
ext_modules = [jq_extension],
|
|
- cmdclass={"build_ext": jq_build_ext},
|
|
classifiers=[
|
|
'Development Status :: 4 - Beta',
|
|
'Intended Audience :: Developers',
|
|
@@ -123,4 +45,3 @@ setup(
|
|
'Programming Language :: Python :: 3.5',
|
|
],
|
|
)
|
|
-
|
|
--
|
|
2.19.2
|
|
|