Skip to content

Commit

Permalink
gpkg/jsoncpp: new pkg
Browse files Browse the repository at this point in the history
gpkg/binutils-libs: fixing dependencies
gpkg/libgc: new pkg
gpkg/rhash: new pkg
gpkg/cppdap: new pkg
gpkg/libuv: fix
gpkg/make: new pkg
gpkg/nlohmann-json: new pkg
gpkg/cmake: new pkg
gpkg/libnghttp2: upd to 1.56.0
gpkg/libcurl: rebuild
  • Loading branch information
Maxython committed Sep 22, 2023
1 parent a3c3ea8 commit dfc9d32
Show file tree
Hide file tree
Showing 17 changed files with 222 additions and 2 deletions.
1 change: 1 addition & 0 deletions gpkg/binutils-libs/binutils.subpackage.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ glibc/bin/
glibc/share/info/
"
TERMUX_SUBPKG_DESCRIPTION="GNU Binutils (metapackage)"
TERMUX_SUBPKG_DEPENDS="libbz2-glibc, libdebuginfod-glibc"
1 change: 1 addition & 0 deletions gpkg/binutils-libs/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="GNU Binutils libraries"
TERMUX_PKG_LICENSE="GPL-3.0"
TERMUX_PKG_MAINTAINER="@termux-pacman"
TERMUX_PKG_VERSION=2.41
TERMUX_PKG_REVISION=1
TERMUX_PKG_SRCURL=https://ftp.gnu.org/gnu/binutils/binutils-$TERMUX_PKG_VERSION.tar.xz
TERMUX_PKG_SHA256=ae9a5789e23459e59606e6714723f2d3ffc31c03174191ef0d015bdf06007450
TERMUX_PKG_DEPENDS="glibc, libjansson-glibc, libelf-glibc, zlib-glibc, zstd-glibc"
Expand Down
12 changes: 12 additions & 0 deletions gpkg/cmake/Source-cmExecProgramCommand.cxx.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
diff -u -r ../cmake-3.15.2/Source/cmExecProgramCommand.cxx ./Source/cmExecProgramCommand.cxx
--- ../cmake-3.15.2/Source/cmExecProgramCommand.cxx 2019-08-07 16:58:29.000000000 +0000
+++ ./Source/cmExecProgramCommand.cxx 2019-08-18 20:05:17.156753010 +0000
@@ -205,7 +205,7 @@
}
fflush(stdout);
fflush(stderr);
- const char* cmd[] = { "/bin/sh", "-c", command.c_str(), nullptr };
+ const char* cmd[] = { "@TERMUX_PREFIX@/bin/sh", "-c", command.c_str(), nullptr };
cmsysProcess_SetCommand(cp, cmd);
#endif

12 changes: 12 additions & 0 deletions gpkg/cmake/Source-cmLocalUnixMakefileGenerator3.cxx.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
diff -u -r ../cmake-3.2.2/Source/cmLocalUnixMakefileGenerator3.cxx ./Source/cmLocalUnixMakefileGenerator3.cxx
--- ../cmake-3.2.2/Source/cmLocalUnixMakefileGenerator3.cxx 2015-04-13 13:09:00.000000000 -0400
+++ ./Source/cmLocalUnixMakefileGenerator3.cxx 2015-05-24 16:04:48.182697757 -0400
@@ -743,7 +743,7 @@
#if !defined(__VMS)
makefileStream
<< "# The shell in which to execute make rules.\n"
- << "SHELL = /bin/sh\n"
+ << "SHELL = @TERMUX_PREFIX@/bin/sh\n"
<< "\n";
#endif
}
31 changes: 31 additions & 0 deletions gpkg/cmake/build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
TERMUX_PKG_HOMEPAGE=https://cmake.org/
TERMUX_PKG_DESCRIPTION="Family of tools designed to build, test and package software"
TERMUX_PKG_LICENSE="BSD 3-Clause"
TERMUX_PKG_MAINTAINER="@termux-pacman"
TERMUX_PKG_VERSION=3.27.5
TERMUX_PKG_SRCURL=https://www.cmake.org/files/v${TERMUX_PKG_VERSION:0:4}/cmake-${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_SHA256=5175e8fe1ca9b1dd09090130db7201968bcce1595971ff9e9998c2f0765004c9
TERMUX_PKG_DEPENDS="libcurl-glibc, libarchive-glibc, jsoncpp-glibc, libuv-glibc, rhash-glibc, cppdap-glibc, libexpat-glibc"
TERMUX_PKG_RECOMMENDS="gcc-glibc, make-glibc"
TERMUX_PKG_FORCE_CMAKE=true
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
-DSPHINX_MAN=ON
-DSPHINX_HTML=ON
-DCMAKE_MAN_DIR=share/man
-DCMAKE_DOC_DIR=share/doc/cmake
-DCMAKE_USE_SYSTEM_CURL=ON
-DCMAKE_USE_SYSTEM_EXPAT=ON
-DCMAKE_USE_SYSTEM_FORM=ON
-DCMAKE_USE_SYSTEM_JSONCPP=ON
-DCMAKE_USE_SYSTEM_LIBARCHIVE=ON
-DCMAKE_USE_SYSTEM_LIBRHASH=ON
-DCMAKE_USE_SYSTEM_LIBUV=ON
-DCMAKE_USE_SYSTEM_ZLIB=ON
-DCMAKE_USE_SYSTEM_CPPDAP=ON
-DBUILD_CursesDialog=ON
-DCMake_ENABLE_DEBUGGER=ON
"

termux_step_pre_configure() {
LDFLAGS+=" -lnghttp2"
}
3 changes: 3 additions & 0 deletions gpkg/cmake/cmake-curses-gui.subpackage.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
TERMUX_SUBPKG_INCLUDE="glibc/bin/ccmake"
TERMUX_SUBPKG_DESCRIPTION="Curses based user interface for CMake (ccmake)"
TERMUX_SUBPKG_DEPENDS="ncurses-ui-libs-glibc"
14 changes: 14 additions & 0 deletions gpkg/cppdap/build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
TERMUX_PKG_HOMEPAGE=https://github.com/google/cppdap
TERMUX_PKG_DESCRIPTION="C++ library for the Debug Adapter Protocol"
TERMUX_PKG_LICENSE="Apache-2.0"
TERMUX_PKG_MAINTAINER="@termux-pacman"
TERMUX_PKG_VERSION=1.58.0
TERMUX_PKG_SRCURL=https://github.com/google/cppdap/archive/dap-$TERMUX_PKG_VERSION-a.tar.gz
TERMUX_PKG_SHA256=5d35ca5db78570b6bef698e3365f79bd82a4f78e8393546387f78d7bdb2a2a08
TERMUX_PKG_DEPENDS="gcc-libs-glibc"
TERMUX_PKG_BUILD_DEPENDS="nlohmann-json-glibc"
TERMUX_PKG_BUILD_IN_SRC=true
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
-DCPPDAP_USE_EXTERNAL_NLOHMANN_JSON_PACKAGE=ON
-DBUILD_SHARED_LIBS=ON
"
13 changes: 13 additions & 0 deletions gpkg/jsoncpp/build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
TERMUX_PKG_HOMEPAGE=https://github.com/open-source-parsers/jsoncpp
TERMUX_PKG_DESCRIPTION="C++ library for interacting with JSON"
TERMUX_PKG_LICENSE="MIT"
TERMUX_PKG_MAINTAINER="@termux-pacman"
TERMUX_PKG_VERSION=1.9.5
TERMUX_PKG_SRCURL=https://github.com/open-source-parsers/jsoncpp/archive/${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_SHA256=f409856e5920c18d0c2fb85276e24ee607d2a09b5e7d5f0a371368903c275da2
TERMUX_PKG_DEPENDS="glibc"
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
-DBUILD_SHARED_LIBS=ON
-DJSONCPP_WITH_TESTS=OFF
-DCCACHE_FOUND=OFF
"
11 changes: 11 additions & 0 deletions gpkg/libgc/build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
TERMUX_PKG_HOMEPAGE=https://www.hboehm.info/gc/
TERMUX_PKG_DESCRIPTION="Library providing the Boehm-Demers-Weiser conservative garbage collector"
TERMUX_PKG_LICENSE="MIT"
TERMUX_PKG_LICENSE_FILE="README.QUICK"
TERMUX_PKG_MAINTAINER="@termux-pacman"
TERMUX_PKG_VERSION=8.2.4
TERMUX_PKG_SRCURL=https://github.com/ivmai/bdwgc/releases/download/v$TERMUX_PKG_VERSION/gc-$TERMUX_PKG_VERSION.tar.gz
TERMUX_PKG_SHA256=3d0d3cdbe077403d3106bb40f0cbb563413d6efdbb2a7e1cd6886595dec48fc2
TERMUX_PKG_DEPENDS="gcc-libs-glibc"
TERMUX_PKG_RM_AFTER_INSTALL="share/gc"
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-cplusplus"
4 changes: 2 additions & 2 deletions gpkg/libnghttp2/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ TERMUX_PKG_HOMEPAGE=https://nghttp2.org/
TERMUX_PKG_DESCRIPTION="nghttp HTTP 2.0 library"
TERMUX_PKG_LICENSE="MIT"
TERMUX_PKG_MAINTAINER="@termux-pacman"
TERMUX_PKG_VERSION=1.55.1
TERMUX_PKG_VERSION=1.56.0
TERMUX_PKG_SRCURL=https://github.com/nghttp2/nghttp2/releases/download/v${TERMUX_PKG_VERSION}/nghttp2-${TERMUX_PKG_VERSION}.tar.xz
TERMUX_PKG_SHA256=19490b7c8c2ded1cf7c3e3a54ef4304e3a7876ae2d950d60a81d0dc6053be419
TERMUX_PKG_SHA256=65eee8021e9d3620589a4a4e91ce9983d802b5229f78f3313770e13f4d2720e9
TERMUX_PKG_DEPENDS="glibc"
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-lib-only"
1 change: 1 addition & 0 deletions gpkg/libuv/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ TERMUX_PKG_LICENSE="MIT, BSD 2-Clause, ISC, BSD 3-Clause"
TERMUX_PKG_LICENSE_FILE="LICENSE"
TERMUX_PKG_MAINTAINER="@termux-pacman"
TERMUX_PKG_VERSION=1.46.0
TERMUX_PKG_REVISION=1
TERMUX_PKG_SRCURL=https://dist.libuv.org/dist/v${TERMUX_PKG_VERSION}/libuv-v${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_SHA256=111f83958b9fdc65f1489195d25f342b9f7a3e683140c60e62c00fbaccddddce
TERMUX_PKG_DEPENDS="libnsl-glibc"
Expand Down
32 changes: 32 additions & 0 deletions gpkg/libuv/linux.c.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
--- libuv-v1.46.0/src/unix/linux.c 2023-06-30 21:31:51.000000000 +0300
+++ libuv-v1.46.0/src/unix/linux.c.patch 2023-09-21 12:25:13.696050386 +0300
@@ -392,7 +392,7 @@


int uv__io_uring_setup(int entries, struct uv__io_uring_params* params) {
- return syscall(__NR_io_uring_setup, entries, params);
+ return errno = ENOSYS, -1;
}


@@ -404,18 +404,12 @@
* in newer kernels unless IORING_ENTER_EXT_ARG is set,
* in which case it takes a struct io_uring_getevents_arg.
*/
- return syscall(__NR_io_uring_enter,
- fd,
- to_submit,
- min_complete,
- flags,
- NULL,
- 0L);
+ return errno = ENOSYS, -1;
}


int uv__io_uring_register(int fd, unsigned opcode, void* arg, unsigned nargs) {
- return syscall(__NR_io_uring_register, fd, opcode, arg, nargs);
+ return errno = ENOSYS, -1;
}


27 changes: 27 additions & 0 deletions gpkg/make/build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
TERMUX_PKG_HOMEPAGE=https://www.gnu.org/software/make/
TERMUX_PKG_DESCRIPTION="Tool to control the generation of non-source files from source files"
TERMUX_PKG_LICENSE="GPL-3.0"
TERMUX_PKG_MAINTAINER="@termux-pacman"
# Update both make and make-guile to the same version in one PR.
TERMUX_PKG_VERSION=4.4.1
TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/make/make-${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_SHA256=dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3
TERMUX_PKG_DEPENDS="glibc"
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--without-guile"

termux_step_make() {
# Allow to bootstrap make if building on device without make installed.
if $TERMUX_ON_DEVICE_BUILD && [ -z "$(command -v make)" ]; then
./build.sh
else
make -j $TERMUX_MAKE_PROCESSES
fi
}

termux_step_make_install() {
if $TERMUX_ON_DEVICE_BUILD && [ -z "$(command -v make)" ]; then
./make -j 1 install
else
make -j 1 install
fi
}
12 changes: 12 additions & 0 deletions gpkg/make/src-job.c.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
diff -u -r ../make-4.3/src/job.c ./src/job.c
--- ../make-4.3/src/job.c 2020-01-19 20:32:59.000000000 +0000
+++ ./src/job.c 2020-01-22 11:01:36.728655000 +0000
@@ -77,7 +77,7 @@

#else

-const char *default_shell = "/bin/sh";
+const char *default_shell = "@TERMUX_PREFIX@/bin/sh";
int batch_mode_shell = 0;

#endif
15 changes: 15 additions & 0 deletions gpkg/nlohmann-json/build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
TERMUX_PKG_HOMEPAGE=https://github.com/nlohmann/json
TERMUX_PKG_DESCRIPTION="JSON for Modern C++"
TERMUX_PKG_LICENSE="MIT"
TERMUX_PKG_LICENSE_FILE="LICENSE.MIT"
TERMUX_PKG_MAINTAINER="@termux-pacman"
TERMUX_PKG_VERSION="3.11.2"
TERMUX_PKG_SRCURL=https://github.com/nlohmann/json/archive/v${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_SHA256=d69f9deb6a75e2580465c6c4c5111b89c4dc2fa94e3a85fcd2ffcd9a143d9273
TERMUX_PKG_PLATFORM_INDEPENDENT=true
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
-DCMAKE_BUILD_TYPE=None
-DJSON_MultipleHeaders=ON
-DJSON_BuildTests=off
-Wno-dev
"
14 changes: 14 additions & 0 deletions gpkg/rhash/build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
TERMUX_PKG_HOMEPAGE=https://github.com/rhash/RHash
TERMUX_PKG_DESCRIPTION="Console utility for calculation and verification of magnet links and a wide range of hash sums"
TERMUX_PKG_LICENSE="MIT"
TERMUX_PKG_MAINTAINER="@termux-pacman"
TERMUX_PKG_VERSION=1.4.4
TERMUX_PKG_SRCURL=https://github.com/rhash/RHash/archive/v$TERMUX_PKG_VERSION.tar.gz
TERMUX_PKG_SHA256=8e7d1a8ccac0143c8fe9b68ebac67d485df119ea17a613f4038cda52f84ef52a
TERMUX_PKG_DEPENDS="glibc"
TERMUX_PKG_BUILD_IN_SRC=true
TERMUX_PKG_CONFFILES="glibc/etc/rhashrc"

termux_step_post_make_install() {
make -C librhash install-lib-headers install-lib-shared install-so-link
}
21 changes: 21 additions & 0 deletions gpkg/rhash/configure.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
--- ./configure 2021-07-15 02:25:34.000000000 +0530
+++ ./configure.mod 2021-07-25 17:40:51.831883002 +0530
@@ -239,8 +239,7 @@
BUILD_EXTRA_LDFLAGS="$BUILD_EXTRA_LDFLAGS $(get_opt_value $OPT)"
;;
*)
- echo "unknown option $OPT"
- exit 1
+ echo "WARNING: unknown option $OPT"
;;
esac
shift
@@ -487,7 +486,7 @@

# Checking CC version...
# Intel C++ Compilers (no autoselect, use CC=/some/binary ./configure)
-cc_vendor=
+cc_vendor=clang
if test "$(basename $CC)" = "icc" || test "$(basename $CC)" = "ecc"; then
start_check "$CC version"
cc_vendor=intel

0 comments on commit dfc9d32

Please sign in to comment.