From 9b38956f1997b80e3c75c720aaa6344efd40e757 Mon Sep 17 00:00:00 2001 From: Lucy Phipps Date: Sun, 31 Jan 2021 09:25:52 +0000 Subject: [PATCH 1/3] fix git-svn --- packages/git/build.sh | 1 + packages/git/git-svn.subpackage.sh | 4 ++++ packages/subversion/build.sh | 4 +++- packages/subversion/subversion-perl.subpackage.sh | 8 ++++++++ 4 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 packages/git/git-svn.subpackage.sh create mode 100644 packages/subversion/subversion-perl.subpackage.sh diff --git a/packages/git/build.sh b/packages/git/build.sh index 8a7ab932a84ad1..f94bbc9f41427b 100644 --- a/packages/git/build.sh +++ b/packages/git/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Fast, scalable, distributed revision control system" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=2.30.0 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://www.kernel.org/pub/software/scm/git/git-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=55735021109565721af805af382c45cce73c3cfaa59daad22443d1477d334d19 TERMUX_PKG_DEPENDS="libcurl, libiconv, less, openssl, pcre2, zlib" diff --git a/packages/git/git-svn.subpackage.sh b/packages/git/git-svn.subpackage.sh new file mode 100644 index 00000000000000..1e26a31dac6d74 --- /dev/null +++ b/packages/git/git-svn.subpackage.sh @@ -0,0 +1,4 @@ +TERMUX_SUBPKG_DESCRIPTION="Convert between Git and Subversion repositories" +TERMUX_SUBPKG_DEPENDS="subversion-perl" +TERMUX_SUBPKG_PLATFORM_INDEPENDENT=true +TERMUX_SUBPKG_INCLUDE="libexec/git-core/git-svn" diff --git a/packages/subversion/build.sh b/packages/subversion/build.sh index af46a206ae2f9f..f01a66df11dcea 100644 --- a/packages/subversion/build.sh +++ b/packages/subversion/build.sh @@ -3,10 +3,12 @@ TERMUX_PKG_DESCRIPTION="Centralized version control system characterized by its TERMUX_PKG_LICENSE="Apache-2.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=1.14.0 -TERMUX_PKG_REVISION=3 +TERMUX_PKG_REVISION=4 TERMUX_PKG_SRCURL=https://www.apache.org/dist/subversion/subversion-${TERMUX_PKG_VERSION}.tar.bz2 TERMUX_PKG_SHA256=6ba8e218f9f97a83a799e58a3c6da1221d034b18d9d8cbbcb6ec52ab11722102 TERMUX_PKG_DEPENDS="apr, apr-util, serf, libexpat, libsqlite, liblz4, utf8proc, zlib" +TERMUX_PKG_BUILD_DEPENDS="perl" +TERMUX_PKG_RECOMMENDS="subversion-perl" TERMUX_PKG_BREAKS="subversion-dev" TERMUX_PKG_REPLACES="subversion-dev" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" diff --git a/packages/subversion/subversion-perl.subpackage.sh b/packages/subversion/subversion-perl.subpackage.sh new file mode 100644 index 00000000000000..3e8d6ff8e7603a --- /dev/null +++ b/packages/subversion/subversion-perl.subpackage.sh @@ -0,0 +1,8 @@ +TERMUX_SUBPKG_DESCRIPTION="Subversion bundings for Perl" +TERMUX_SUBPKG_DEPENDS="perl" +TERMUX_SUBPKG_PLATFORM_INDEPENDENT=true +TERMUX_SUBPKG_INCLUDE=" +lib/*/perl5/* +lib/*/libsvn_swig_perl*.so.* +share/man/man3/SVN::*.3perl +" From 7d7a589c76daf2e70b112868c46d803a3d0ccf4f Mon Sep 17 00:00:00 2001 From: Lucy Phipps Date: Sun, 31 Jan 2021 11:01:20 +0000 Subject: [PATCH 2/3] subversion: make swig-pl --- packages/subversion/build.sh | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/packages/subversion/build.sh b/packages/subversion/build.sh index f01a66df11dcea..e19050774e14fe 100644 --- a/packages/subversion/build.sh +++ b/packages/subversion/build.sh @@ -20,3 +20,12 @@ svn_cv_pycfmt_apr_int64_t=UNUSED_REMOVE_AFTER_NEXT_UPDATE termux_step_pre_configure() { CFLAGS+=" -std=c11" } + +termux_step_post_make() { + make swig-pl + make check-swig-pl +} + +termux_step_post_make_install() { + make install-swig-pl +} From 2b7fda6db9a224a1e91e7c7336753236dd4ff39d Mon Sep 17 00:00:00 2001 From: Lucy Phipps Date: Sun, 31 Jan 2021 11:36:55 +0000 Subject: [PATCH 3/3] only build subversion-perl on x86_64 --- packages/subversion/build.sh | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/packages/subversion/build.sh b/packages/subversion/build.sh index e19050774e14fe..67133b029f507f 100644 --- a/packages/subversion/build.sh +++ b/packages/subversion/build.sh @@ -22,10 +22,14 @@ termux_step_pre_configure() { } termux_step_post_make() { - make swig-pl - make check-swig-pl + if [ "$TERMUX_ARCH" = "x86_64" ]; then + make swig-pl + make check-swig-pl + fi } termux_step_post_make_install() { - make install-swig-pl + if [ "$TERMUX_ARCH" = "x86_64" ]; then + make install-swig-pl + fi }