diff --git a/packages/rcshell/build.sh b/packages/rcshell/build.sh index 172d09c0d..3f8a170a1 100644 --- a/packages/rcshell/build.sh +++ b/packages/rcshell/build.sh @@ -3,13 +3,26 @@ TERMUX_PKG_DESCRIPTION="An alternative implementation of the plan 9 rc shell" TERMUX_PKG_LICENSE="ZLIB" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=1.7.4 -TERMUX_PKG_REVISION=3 -TERMUX_PKG_SRCURL=https://sources.voidlinux-ppc.org/rc-${TERMUX_PKG_VERSION}/rc-${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=5ed26334dd0c1a616248b15ad7c90ca678ae3066fa02c5ddd0e6936f9af9bfd8 +TERMUX_PKG_REVISION=4 +TERMUX_PKG_SRCURL=https://sources.voidlinux-ppc.org/rc-${TERMUX_PKG_VERSION}/v${TERMUX_PKG_VERSION}.tar.gz +TERMUX_PKG_SHA256=0b83f8698dd8ef44ca97b25c4748c087133f53c7fff39b6b70dab65931def8b0 TERMUX_PKG_DEPENDS="readline" TERMUX_PKG_BUILD_IN_SRC=true +TERMUX_PKG_HOSTBUILD=true TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" ac_cv_func_setpgrp_void=yes rc_cv_sysv_sigcld=no " + +termux_step_host_build() { + (cd $TERMUX_PKG_SRCDIR && autoreconf -vfi) + $TERMUX_PKG_SRCDIR/configure + make mksignal mkstatval +} + +termux_step_pre_configure() { + autoreconf -vfi + cp $TERMUX_PKG_HOSTBUILD_DIR/{mksignal,mkstatval} $TERMUX_PKG_BUILDDIR/ + touch -d 'next hour' $TERMUX_PKG_BUILDDIR/{mksignal,mkstatval} +} diff --git a/packages/rcshell/rc-1.7.4_Makefile.in.patch b/packages/rcshell/rc-1.7.4_Makefile.in.patch deleted file mode 100644 index 64c7478e1..000000000 --- a/packages/rcshell/rc-1.7.4_Makefile.in.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -uNr rc-1.7.4/Makefile.in rc-1.7.4.mod/Makefile.in ---- rc-1.7.4/Makefile.in 2015-05-14 00:26:18.000000000 +0300 -+++ rc-1.7.4.mod/Makefile.in 2020-01-01 19:24:41.726859279 +0200 -@@ -438,13 +438,13 @@ - @rm -f history$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(history_OBJECTS) $(history_LDADD) $(LIBS) - --mksignal$(EXEEXT): $(mksignal_OBJECTS) $(mksignal_DEPENDENCIES) $(EXTRA_mksignal_DEPENDENCIES) -+mksignal$(EXEEXT): $(mksignal_SOURCES) $(mksignal_DEPENDENCIES) $(EXTRA_mksignal_DEPENDENCIES) - @rm -f mksignal$(EXEEXT) -- $(AM_V_CCLD)$(LINK) $(mksignal_OBJECTS) $(mksignal_LDADD) $(LIBS) -+ $(AM_V_CCLD)gcc $(mksignal_SOURCES) $(mksignal_LDADD) $(LIBS) -o mksignal$(EXEEXT) - - mkstatval$(EXEEXT): $(mkstatval_OBJECTS) $(mkstatval_DEPENDENCIES) $(EXTRA_mkstatval_DEPENDENCIES) - @rm -f mkstatval$(EXEEXT) -- $(AM_V_CCLD)$(LINK) $(mkstatval_OBJECTS) $(mkstatval_LDADD) $(LIBS) -+ $(AM_V_CCLD)gcc $(mkstatval_SOURCES) $(mkstatval_LDADD) $(LIBS) -o mkstatval$(EXEEXT) - - rc$(EXEEXT): $(rc_OBJECTS) $(rc_DEPENDENCIES) $(EXTRA_rc_DEPENDENCIES) - @rm -f rc$(EXEEXT)