tmux: make use of its own TMUX_TMPDIR env var

We have _PATH_TMP defined in our NDK paths.h patch. Therefore, the
patching here won't be in effect.

Instead of making use of the also defined _PATH_VARRUN, let's just
make tmux use $PREFIX/var/run as its socket path with its env var
TMUX_TMPDIR.
This commit is contained in:
Tom Yan 2021-11-06 13:13:11 +08:00 committed by Henrik Grimler
parent 0cf7839ed8
commit f8e73d4660
2 changed files with 9 additions and 38 deletions

View File

@ -5,13 +5,14 @@ TERMUX_PKG_MAINTAINER="@termux"
# Link against libandroid-support for wcwidth(), see https://github.com/termux/termux-packages/issues/224
TERMUX_PKG_DEPENDS="ncurses, libevent, libandroid-support, libandroid-glob"
TERMUX_PKG_VERSION=3.2a
TERMUX_PKG_SRCURL=https://github.com/tmux/tmux/archive/${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_REVISION=1
TERMUX_PKG_SRCURL="https://github.com/tmux/tmux/archive/${TERMUX_PKG_VERSION}.tar.gz"
TERMUX_PKG_SHA256=497bc4ee16f10b53b161bf0253b6f9e20cd0f86c5d0104f149212cb0778ae13a
TERMUX_PKG_AUTO_UPDATE=true
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-static"
TERMUX_PKG_BUILD_IN_SRC=true
TERMUX_PKG_CONFFILES="etc/tmux.conf"
TERMUX_PKG_CONFFILES="etc/tmux.conf etc/profile.d/tmux.sh"
termux_step_pre_configure() {
LDFLAGS+=" -landroid-glob"
@ -19,12 +20,15 @@ termux_step_pre_configure() {
}
termux_step_post_make_install() {
cp $TERMUX_PKG_BUILDER_DIR/tmux.conf $TERMUX_PREFIX/etc/tmux.conf
cp "$TERMUX_PKG_BUILDER_DIR"/tmux.conf "$TERMUX_PREFIX"/etc/tmux.conf
mkdir -p $TERMUX_PREFIX/share/bash-completion/completions
mkdir -p "$TERMUX_PREFIX"/etc/profile.d
echo "export TMUX_TMPDIR=$TERMUX_PREFIX/var/run" > "$TERMUX_PREFIX"/etc/profile.d/tmux.sh
mkdir -p "$TERMUX_PREFIX"/share/bash-completion/completions
termux_download \
https://raw.githubusercontent.com/imomaliev/tmux-bash-completion/homebrew_1.0.0/completions/tmux \
$TERMUX_PREFIX/share/bash-completion/completions/tmux \
"$TERMUX_PREFIX"/share/bash-completion/completions/tmux \
05e79fc1ecb27637dc9d6a52c315b8f207cf010cdcee9928805525076c9020ae
}

View File

@ -1,33 +0,0 @@
diff -u -r ../tmux-3.2/compat.h ./compat.h
--- ../tmux-3.2/compat.h 2021-03-02 13:07:17.000000000 +0100
+++ ./compat.h 2021-04-13 10:04:41.511077498 +0200
@@ -99,7 +99,7 @@
#endif
#ifndef _PATH_TMP
-#define _PATH_TMP "/tmp/"
+#define _PATH_TMP "@TERMUX_PREFIX@/var/run"
#endif
#ifndef _PATH_DEVNULL
diff -u -r ../tmux-3.2/tmux.1 ./tmux.1
--- ../tmux-3.2/tmux.1 2021-04-13 07:26:00.000000000 +0200
+++ ./tmux.1 2021-04-13 10:07:01.666057472 +0200
@@ -91,7 +91,7 @@
.Em server .
The server and each client are separate processes which communicate through a
socket in
-.Pa /tmp .
+.Pa @TERMUX_PREFIX@/var/run .
.Pp
The options are as follows:
.Bl -tag -width "XXXXXXXXXXXX"
@@ -159,7 +159,7 @@
stores the server socket in a directory under
.Ev TMUX_TMPDIR
or
-.Pa /tmp
+.Pa @TERMUX_PREFIX@/var/run
if it is unset.
The default socket is named
.Em default .