From ae1ed14d793faa22a142f399d9d4eeaa092936ed Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Fri, 11 Feb 2022 18:01:56 +0100 Subject: [PATCH] scdoc: build host tools in termux_step_host_build And also fix pkgconfig path and avoid overriding termux_step_make_install. --- ...efile.patch => Makefile.patch.beforehostbuild} | 7 ++++--- packages/scdoc/build.sh | 15 +++++---------- 2 files changed, 9 insertions(+), 13 deletions(-) rename packages/scdoc/{Makefile.patch => Makefile.patch.beforehostbuild} (90%) diff --git a/packages/scdoc/Makefile.patch b/packages/scdoc/Makefile.patch.beforehostbuild similarity index 90% rename from packages/scdoc/Makefile.patch rename to packages/scdoc/Makefile.patch.beforehostbuild index bad724803..06e4aaca1 100644 --- a/packages/scdoc/Makefile.patch +++ b/packages/scdoc/Makefile.patch.beforehostbuild @@ -1,5 +1,5 @@ ---- ./Makefile.orig 2022-02-03 18:20:50.006850878 +0530 -+++ ./Makefile 2022-02-03 18:21:34.996850861 +0530 +--- ../scdoc-1.11.2/Makefile 2021-11-13 08:04:45.000000000 +0000 ++++ ./Makefile 2022-02-14 21:02:27.782047209 +0000 @@ -1,14 +1,14 @@ VERSION=1.11.2 CFLAGS?=-g @@ -10,9 +10,10 @@ PREFIX?=/usr/local BINDIR?=$(PREFIX)/bin MANDIR?=$(PREFIX)/share/man - PCDIR?=$(PREFIX)/share/pkgconfig +-PCDIR?=$(PREFIX)/share/pkgconfig -OUTDIR=.build -HOST_SCDOC=./scdoc ++PCDIR?=$(PREFIX)/lib/pkgconfig +OUTDIR?=.build +HOST_SCDOC?=$(OUTDIR)/scdoc .DEFAULT_GOAL=all diff --git a/packages/scdoc/build.sh b/packages/scdoc/build.sh index 8b90870f6..370892619 100644 --- a/packages/scdoc/build.sh +++ b/packages/scdoc/build.sh @@ -3,19 +3,14 @@ TERMUX_PKG_DESCRIPTION="Small man page generator" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="Yaksh Bariya " TERMUX_PKG_VERSION=1.11.2 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://git.sr.ht/~sircmpwn/scdoc/archive/$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=e9ff9981b5854301789a6778ee64ef1f6d1e5f4829a9dd3e58a9a63eacc2e6f0 TERMUX_PKG_BUILD_IN_SRC=true +TERMUX_PKG_EXTRA_MAKE_ARGS="OUTDIR=$TERMUX_PKG_SRCDIR HOST_SCDOC=$TERMUX_PKG_HOSTBUILD_DIR/scdoc" +TERMUX_PKG_HOSTBUILD=true -termux_step_make() { +termux_step_host_build() { cd $TERMUX_PKG_SRCDIR - ( - unset CC CXX CFLAGS CXXFLAGS LD LDFLAGS - make PREFIX=/usr OUTDIR=$TERMUX_PKG_HOSTBUILD_DIR CC=clang - ) - make PREFIX=$TERMUX_PREFIX OUTDIR=$TERMUX_PKG_SRCDIR HOST_SCDOC=$TERMUX_PKG_HOSTBUILD_DIR/scdoc install -} - -termux_step_make_install() { - : + make OUTDIR=$TERMUX_PKG_HOSTBUILD_DIR }