From 75b3526c80408aa8f03ed879ffbef2b05d40d27f Mon Sep 17 00:00:00 2001 From: Yaksh Bariya Date: Sun, 6 Feb 2022 15:30:52 +0530 Subject: [PATCH] calc: update to v2.14.0.14 --- packages/calc/build.sh | 23 +++++++++++++++-------- packages/calc/no-march-native.patch | 13 ------------- 2 files changed, 15 insertions(+), 21 deletions(-) delete mode 100644 packages/calc/no-march-native.patch diff --git a/packages/calc/build.sh b/packages/calc/build.sh index a6af1c08b..46c0571ed 100644 --- a/packages/calc/build.sh +++ b/packages/calc/build.sh @@ -2,23 +2,30 @@ TERMUX_PKG_HOMEPAGE=http://www.isthe.com/chongo/tech/comp/calc/ TERMUX_PKG_DESCRIPTION="Arbitrary precision console calculator" TERMUX_PKG_LICENSE="LGPL-2.1" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=2.14.0.8 +TERMUX_PKG_VERSION=2.14.0.14 TERMUX_PKG_SRCURL=https://github.com/lcn2/calc/releases/download/v$TERMUX_PKG_VERSION/calc-$TERMUX_PKG_VERSION.tar.bz2 -TERMUX_PKG_SHA256=ad6a2c44eeea7e06efca5384f107ffaee7564407a7474d7cd4928a53b1a28386 +TERMUX_PKG_SHA256=f7727835a103d9712c571958e924e9c254bd148f08eb4348019bc34f8e71c55d TERMUX_PKG_AUTO_UPDATE=true TERMUX_PKG_DEPENDS="ncurses, ncurses-ui-libs, readline" TERMUX_PKG_BUILD_IN_SRC=true termux_step_make() { - # Fails with -j$TERMUX_MAKE_PROCESSES for some reason - make USE_READLINE="-DUSE_READLINE" READLINE_EXTRAS="-lhistory -lncurses" \ + make CC="$CC" \ + USE_READLINE="-DUSE_READLINE" \ + READLINE_EXTRAS="-lhistory -lncurses" \ READLINE_LIB="-L$TERMUX_PREFIX/lib -lreadline" \ READLINE_INCLUDE="-I$TERMUX_PREFIX/include" \ - DEFAULT_LIB_INSTALL_PATH="$TERMUX_PREFIX/lib" CC="$CC" -j1 \ - LONG_BITS=$TERMUX_ARCH_BITS + DEFAULT_LIB_INSTALL_PATH="$TERMUX_PREFIX/lib" \ + LONG_BITS=$TERMUX_ARCH_BITS \ + T="$TERMUX_PREFIX" \ + BINDIR="$TERMUX_PREFIX/bin" \ + LIBDIR="$TERMUX_PREFIX/lib" \ + INCDIR="$TERMUX_PREFIX/include" \ + SCRIPTDIR="$TERMUX_PREFIX/share/calc/cscript" \ + CALC_SHAREDIR="$TERMUX_PREFIX/share/calc" \ + install } termux_step_make_install() { - make T="$TERMUX_PREFIX" BINDIR="/bin" LIBDIR="/lib" INCDIR="/include" \ - SCRIPTDIR="/share/calc/cscript" CALC_SHAREDIR="/share/calc" install + : } diff --git a/packages/calc/no-march-native.patch b/packages/calc/no-march-native.patch deleted file mode 100644 index 73d2d8b09..000000000 --- a/packages/calc/no-march-native.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- ./Makefile 2021-02-13 06:35:46.000000000 +0000 -+++ ./Makefile 2021-02-14 07:20:08.457009951 +0000 -@@ -1125,8 +1125,8 @@ - # The ARCH_CFLAGS are ${CC} when compiling C files. They follow - # CCMISC and precede EXTRA_CFLAGS. - # --ARCH_CFLAGS= -march=native --#ARCH_CFLAGS= -+#ARCH_CFLAGS= -march=native -+ARCH_CFLAGS= - - # COMMON_CFLAGS are the common ${CC} flags used for all programs, both - # intermediate and final calc and calc related programs