From 115e2fd64221061b3f447d1a25c29cd92682e67d Mon Sep 17 00:00:00 2001 From: Jacob Heider Date: Fri, 14 Oct 2022 21:16:16 -0400 Subject: [PATCH] +jq+oniguruma --- .../github.com/kkos/oniguruma/package.yml | 21 +++++++++++++++++ projects/stedolan.github.io/jq/darwin.diff | 23 +++++++++++++++++++ projects/stedolan.github.io/jq/lgamma_r.diff | 11 +++++++++ projects/stedolan.github.io/jq/package.yml | 22 ++++++++++++++++++ projects/stedolan.github.io/jq/test.json | 12 ++++++++++ 5 files changed, 89 insertions(+) create mode 100644 projects/github.com/kkos/oniguruma/package.yml create mode 100644 projects/stedolan.github.io/jq/darwin.diff create mode 100644 projects/stedolan.github.io/jq/lgamma_r.diff create mode 100644 projects/stedolan.github.io/jq/package.yml create mode 100644 projects/stedolan.github.io/jq/test.json diff --git a/projects/github.com/kkos/oniguruma/package.yml b/projects/github.com/kkos/oniguruma/package.yml new file mode 100644 index 00000000..9b84c722 --- /dev/null +++ b/projects/github.com/kkos/oniguruma/package.yml @@ -0,0 +1,21 @@ +distributable: + url: https://github.com/kkos/oniguruma/releases/download/v{{version}}/onig-{{version}}.tar.gz + strip-components: 1 + +versions: + github: kkos/oniguruma + strip: /[rR]elease / + +provides: + - bin/onig-config + +build: + dependencies: + tea.xyz/gx/cc: c99 + tea.xyz/gx/make: '*' + script: | + ./configure --disable-dependency-tracking --prefix={{prefix}} + make install + +test: + script: test "$(onig-config --version)" = "{{version}}" diff --git a/projects/stedolan.github.io/jq/darwin.diff b/projects/stedolan.github.io/jq/darwin.diff new file mode 100644 index 00000000..c9b49adb --- /dev/null +++ b/projects/stedolan.github.io/jq/darwin.diff @@ -0,0 +1,23 @@ +--- a/configure.orig 2021-10-01 08:15:08.000000000 -0700 ++++ b/configure 2021-10-20 12:44:47.000000000 -0700 +@@ -8733,16 +8733,11 @@ + _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;; + darwin1.*) + _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; +- darwin*) # darwin 5.x on +- # if running on 10.5 or later, the deployment target defaults +- # to the OS version, if on x86, and 10.4, the deployment +- # target defaults to 10.4. Don't you love it? +- case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in +- 10.0,*86*-darwin8*|10.0,*-darwin[91]*) +- _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; +- 10.[012][,.]*) ++ darwin*) ++ case ${MACOSX_DEPLOYMENT_TARGET},$host in ++ 10.[012],*|,*powerpc*) + _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; +- 10.*) ++ *) + _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; + esac + ;; diff --git a/projects/stedolan.github.io/jq/lgamma_r.diff b/projects/stedolan.github.io/jq/lgamma_r.diff new file mode 100644 index 00000000..c14843d2 --- /dev/null +++ b/projects/stedolan.github.io/jq/lgamma_r.diff @@ -0,0 +1,11 @@ +--- a/src/builtin.c.orig 2022-10-14 21:06:52.000000000 -0400 ++++ b/src/builtin.c 2022-10-14 21:07:26.000000000 -0400 +@@ -43,6 +43,8 @@ + #include "jv_unicode.h" + #include "jv_alloc.h" + ++// https://github.com/stedolan/jq/issues/1936 ++char lgamma_r (); + + static jv type_error(jv bad, const char* msg) { + char errbuf[15]; diff --git a/projects/stedolan.github.io/jq/package.yml b/projects/stedolan.github.io/jq/package.yml new file mode 100644 index 00000000..d0eef748 --- /dev/null +++ b/projects/stedolan.github.io/jq/package.yml @@ -0,0 +1,22 @@ +distributable: + url: https://github.com/stedolan/jq/releases/download/jq-{{version.raw}}/jq-{{version.raw}}.tar.gz + strip-components: 1 + +versions: + github: stedolan/jq + strip: /jq / + +build: + dependencies: + tea.xyz/gx/cc: c99 + tea.xyz/gx/make: '*' + github.com/kkos/oniguruma: 6 + git-scm.org: 2 + script: | + git apply props/darwin.diff + git apply props/lgamma_r.diff + ./configure --disable-maintainer-mode --prefix={{prefix}} + make install + +test: + script: test $(jq .devs[1].github < test.json) = '"jhheider"' diff --git a/projects/stedolan.github.io/jq/test.json b/projects/stedolan.github.io/jq/test.json new file mode 100644 index 00000000..a33e6812 --- /dev/null +++ b/projects/stedolan.github.io/jq/test.json @@ -0,0 +1,12 @@ +{ + "devs": [ + { + "name": "Max Howell", + "github": "mxcl" + }, + { + "name": "Jacob Heider", + "github": "jhheider" + } + ] +} \ No newline at end of file