sergiotarxz/termux-packages
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

scdoc: build host tools in termux_step_host_build

Browse Source 
And also fix pkgconfig path and avoid overriding
termux_step_make_install.
This commit is contained in:
Henrik Grimler 2022-02-11 18:01:56 +01:00
parent 7009a7621a
commit ae1ed14d79
No known key found for this signature in database
GPG Key ID: B0076E490B71616B
2 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
packages/scdoc/Makefile.patch → packages/scdoc/Makefile.patch.beforehostbuild
View File

@ -1,5 +1,5 @@
--- ./Makefile.orig 2022-02-03 18:20:50.006850878 +0530 --- ../scdoc-1.11.2/Makefile 2021-11-13 08:04:45.000000000 +0000
+++ ./Makefile 2022-02-03 18:21:34.996850861 +0530 +++ ./Makefile 2022-02-14 21:02:27.782047209 +0000
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
VERSION=1.11.2 VERSION=1.11.2
CFLAGS?=-g CFLAGS?=-g
@ -10,9 +10,10 @@
PREFIX?=/usr/local PREFIX?=/usr/local
BINDIR?=$(PREFIX)/bin BINDIR?=$(PREFIX)/bin
MANDIR?=$(PREFIX)/share/man MANDIR?=$(PREFIX)/share/man
PCDIR?=$(PREFIX)/share/pkgconfig -PCDIR?=$(PREFIX)/share/pkgconfig
-OUTDIR=.build -OUTDIR=.build
-HOST_SCDOC=./scdoc -HOST_SCDOC=./scdoc
+PCDIR?=$(PREFIX)/lib/pkgconfig
+OUTDIR?=.build +OUTDIR?=.build
+HOST_SCDOC?=$(OUTDIR)/scdoc +HOST_SCDOC?=$(OUTDIR)/scdoc
.DEFAULT_GOAL=all .DEFAULT_GOAL=all

15
packages/scdoc/build.sh
View File

@ -3,19 +3,14 @@ TERMUX_PKG_DESCRIPTION="Small man page generator"
TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_LICENSE="MIT"
TERMUX_PKG_MAINTAINER="Yaksh Bariya <yakshbari4@gmail.com>" TERMUX_PKG_MAINTAINER="Yaksh Bariya <yakshbari4@gmail.com>"
TERMUX_PKG_VERSION=1.11.2 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_SRCURL=https://git.sr.ht/~sircmpwn/scdoc/archive/$TERMUX_PKG_VERSION.tar.gz
TERMUX_PKG_SHA256=e9ff9981b5854301789a6778ee64ef1f6d1e5f4829a9dd3e58a9a63eacc2e6f0 TERMUX_PKG_SHA256=e9ff9981b5854301789a6778ee64ef1f6d1e5f4829a9dd3e58a9a63eacc2e6f0
TERMUX_PKG_BUILD_IN_SRC=true 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 cd $TERMUX_PKG_SRCDIR
( make OUTDIR=$TERMUX_PKG_HOSTBUILD_DIR
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() {
:
} }