mirror of
https://github.com/RGBCube/serenity
synced 2025-07-26 01:27:43 +00:00
Ports: Replace the jq
config.sub
patch with our download
This commit is contained in:
parent
2d3724303a
commit
aa18adc43f
5 changed files with 9 additions and 72 deletions
|
@ -6,11 +6,13 @@ configopts=("--with-oniguruma=builtin" "--disable-maintainer-mode")
|
|||
files="https://github.com/stedolan/jq/releases/download/jq-${version}/jq-${version}.tar.gz jq-${version}.tar.gz 5de8c8e29aaa3fb9cc6b47bb27299f271354ebb72514e3accadc7d38b5bbaa72"
|
||||
auth_type=sha256
|
||||
makeopts=("LDFLAGS=-all-static")
|
||||
use_fresh_config_sub=true
|
||||
config_sub_paths=("config/config.sub" "modules/oniguruma/config.sub")
|
||||
|
||||
pre_configure() {
|
||||
# FIXME: The maintainer forgot to run autoconf before creating the tarball.
|
||||
# Remove this when the next update is released.
|
||||
pushd $workdir/modules/oniguruma
|
||||
autoreconf -fi
|
||||
rm config.sub
|
||||
cp ../../config/config.sub config.sub
|
||||
autoreconf -i
|
||||
popd
|
||||
}
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
From 286ee7f25aefdd17945ba141bb5684857575119a Mon Sep 17 00:00:00 2001
|
||||
From: Ali Mohammad Pur <ali.mpfard@gmail.com>
|
||||
Date: Mon, 16 May 2022 16:20:52 +0430
|
||||
Subject: [PATCH 2/3] Make configure assume all dependencies are okay
|
||||
Subject: [PATCH 1/2] Make configure assume all dependencies are okay
|
||||
|
||||
---
|
||||
configure | 4 ++++
|
|
@ -1,60 +0,0 @@
|
|||
From 9c8c438e497732983f053f8a48c33b6a456ddee5 Mon Sep 17 00:00:00 2001
|
||||
From: Ali Mohammad Pur <ali.mpfard@gmail.com>
|
||||
Date: Mon, 16 May 2022 16:20:45 +0430
|
||||
Subject: [PATCH 1/3] Teach config.sub about serenity
|
||||
|
||||
---
|
||||
config/config.sub | 9 ++++++++-
|
||||
modules/oniguruma/config.sub | 2 +-
|
||||
2 files changed, 9 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/config/config.sub b/config/config.sub
|
||||
index 7ffe373..fdda758 100755
|
||||
--- a/config/config.sub
|
||||
+++ b/config/config.sub
|
||||
@@ -117,7 +117,7 @@ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
|
||||
case $maybe_os in
|
||||
nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
|
||||
linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
|
||||
- knetbsd*-gnu* | netbsd*-gnu* | \
|
||||
+ knetbsd*-gnu* | netbsd*-gnu* | *serenity* | \
|
||||
kopensolaris*-gnu* | \
|
||||
storm-chaos* | os2-emx* | rtmk-nova*)
|
||||
os=-$maybe_os
|
||||
@@ -1296,6 +1296,10 @@ case $basic_machine in
|
||||
we32k)
|
||||
basic_machine=we32k-att
|
||||
;;
|
||||
+ *serenity*)
|
||||
+ basic_machine="${SERENITY_ARCH}-pc"
|
||||
+ ;;
|
||||
+
|
||||
sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
|
||||
basic_machine=sh-unknown
|
||||
;;
|
||||
@@ -1423,6 +1427,9 @@ case $os in
|
||||
-linux*)
|
||||
os=`echo $os | sed -e 's|linux|linux-gnu|'`
|
||||
;;
|
||||
+ *-serenity*)
|
||||
+ os=-serenity
|
||||
+ ;;
|
||||
-sunos5*)
|
||||
os=`echo $os | sed -e 's|sunos5|solaris2|'`
|
||||
;;
|
||||
diff --git a/modules/oniguruma/config.sub b/modules/oniguruma/config.sub
|
||||
index cc69b06..a916f15 100755
|
||||
--- a/modules/oniguruma/config.sub
|
||||
+++ b/modules/oniguruma/config.sub
|
||||
@@ -117,7 +117,7 @@ case $maybe_os in
|
||||
nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
|
||||
linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
|
||||
knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \
|
||||
- kopensolaris*-gnu* | cloudabi*-eabi* | \
|
||||
+ kopensolaris*-gnu* | cloudabi*-eabi* | *serenity* \
|
||||
storm-chaos* | os2-emx* | rtmk-nova*)
|
||||
os=-$maybe_os
|
||||
basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
|
||||
--
|
||||
2.36.1
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
From 53246ba7b026c92e42aa4c332007f425d297a4ea Mon Sep 17 00:00:00 2001
|
||||
From: Ali Mohammad Pur <ali.mpfard@gmail.com>
|
||||
Date: Mon, 16 May 2022 16:21:08 +0430
|
||||
Subject: [PATCH 3/3] Make jv_mem_alloc() return a dummy allocation for
|
||||
Subject: [PATCH 2/2] Make jv_mem_alloc() return a dummy allocation for
|
||||
zero-sized allocs
|
||||
|
||||
And make jv_mem_free() accept it.
|
|
@ -1,16 +1,11 @@
|
|||
# Patches for jq on SerenityOS
|
||||
|
||||
## `0001-Teach-config.sub-about-serenity.patch`
|
||||
|
||||
Teach config.sub about serenity
|
||||
|
||||
|
||||
## `0002-Make-configure-assume-all-dependencies-are-okay.patch`
|
||||
## `0001-Make-configure-assume-all-dependencies-are-okay.patch`
|
||||
|
||||
Make configure assume all dependencies are okay
|
||||
|
||||
|
||||
## `0003-Make-jv_mem_alloc-return-a-dummy-allocation-for-zero.patch`
|
||||
## `0002-Make-jv_mem_alloc-return-a-dummy-allocation-for-zero.patch`
|
||||
|
||||
Make jv_mem_alloc() return a dummy allocation for zero-sized allocs
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue