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

misc hardcoded home/prefix fixes

Browse Source
This commit is contained in:
Leonid Pliushch 2020-10-30 22:48:55 +02:00
parent a878e2b206
commit 501ce516cd
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build-package.sh
View File

@ -252,7 +252,7 @@ _show_usage() {
echo " -D Build a disabled package in disabled-packages/." echo " -D Build a disabled package in disabled-packages/."
echo " -f Force build even if package has already been built." echo " -f Force build even if package has already been built."
[ "$TERMUX_ON_DEVICE_BUILD" = "false" ] && echo " -i Download and extract dependencies instead of building them." [ "$TERMUX_ON_DEVICE_BUILD" = "false" ] && echo " -i Download and extract dependencies instead of building them."
echo " -I Download and extract dependencies instead of building them, keep existing /data/data/com.termux files." echo " -I Download and extract dependencies instead of building them, keep existing $TERMUX_BASE_DIR files."
echo " -q Quiet build." echo " -q Quiet build."
echo " -s Skip dependency check." echo " -s Skip dependency check."
echo " -o Specify deb directory. Default: debs/." echo " -o Specify deb directory. Default: debs/."

2
disabled-packages/apt-updated/build.sh
View File

@ -35,5 +35,5 @@ lib/libapt-inst.so
termux_step_post_make_install() { termux_step_post_make_install() {
printf "# The main termux repository:\ndeb [arch=all,${TERMUX_ARCH}] https://termux.net stable main\n" > $TERMUX_PREFIX/etc/apt/sources.list printf "# The main termux repository:\ndeb [arch=all,${TERMUX_ARCH}] https://termux.net stable main\n" > $TERMUX_PREFIX/etc/apt/sources.list
cp $TERMUX_PKG_BUILDER_DIR/trusted.gpg $TERMUX_PREFIX/etc/apt/ cp $TERMUX_PKG_BUILDER_DIR/trusted.gpg $TERMUX_PREFIX/etc/apt/
rm /data/data/com.termux/files/usr/include/apt-pkg -r rm $TERMUX_PREFIX/include/apt-pkg -r
} }

4
disabled-packages/checkinstall/checkinstall.patch
View File

@ -15,7 +15,7 @@ diff -u -r ../checkinstall-1.6.2/checkinstall ./checkinstall
# The place where we will be storing the temp files # The place where we will be storing the temp files
-! [ "$BASE_TMP_DIR" ] && BASE_TMP_DIR=/var/tmp -! [ "$BASE_TMP_DIR" ] && BASE_TMP_DIR=/var/tmp
+! [ "$BASE_TMP_DIR" ] && BASE_TMP_DIR=/data/data/com.termux/files/usr/tmp +! [ "$BASE_TMP_DIR" ] && BASE_TMP_DIR=@TERMUX_PREFIX@/tmp
# Default RPM FLAGS # Default RPM FLAGS
! [ "$RPM_FLAGS" ] && RPM_FLAGS=" --force --nodeps --replacepkgs " ! [ "$RPM_FLAGS" ] && RPM_FLAGS=" --force --nodeps --replacepkgs "
@ -42,7 +42,7 @@ diff -u -r ../checkinstall-1.6.2/checkinstall ./checkinstall
# to be explicit. # to be explicit.
# #
-IEXCLUDE="${DIRECTORIO_FUENTE},/dev,/proc,/tmp,/var/tmp" -IEXCLUDE="${DIRECTORIO_FUENTE},/dev,/proc,/tmp,/var/tmp"
+IEXCLUDE="${DIRECTORIO_FUENTE},/dev,/proc,/tmp,/var/tmp,/data/data/com.termux/files/usr/tmp" +IEXCLUDE="${DIRECTORIO_FUENTE},/dev,/proc,/tmp,/var/tmp,@TERMUX_PREFIX@/tmp"
# Run the install command, showing the results interactively if we were asked # Run the install command, showing the results interactively if we were asked

4
disabled-packages/checkinstall/checkinstallrc-dist.patch
View File

@ -6,7 +6,7 @@ diff -u -r ../checkinstall-1.6.2/checkinstallrc-dist ./checkinstallrc-dist
# Location of the "installwatch" program # Location of the "installwatch" program
-INSTALLWATCH_PREFIX="/usr/local" -INSTALLWATCH_PREFIX="/usr/local"
+INSTALLWATCH_PREFIX="/data/data/com.termux/files/usr" +INSTALLWATCH_PREFIX="@TERMUX_PREFIX@"
INSTALLWATCH=${INSTALLWATCH_PREFIX}/bin/installwatch INSTALLWATCH=${INSTALLWATCH_PREFIX}/bin/installwatch
# Location of the makepkg program. "makepak" is the default, and is # Location of the makepkg program. "makepak" is the default, and is
@ -14,7 +14,7 @@ diff -u -r ../checkinstall-1.6.2/checkinstallrc-dist ./checkinstallrc-dist
# then set this to "makepkg" # then set this to "makepkg"
-MAKEPKG=/sbin/makepkg -MAKEPKG=/sbin/makepkg
+MAKEPKG=/data/data/com.termux/files/usr/bin/makepkg +MAKEPKG=@TERMUX_PREFIX@/bin/makepkg
# makepkg optional flags. These are recommended if running a newer Slackware # makepkg optional flags. These are recommended if running a newer Slackware
# version: "-l y -c n" # version: "-l y -c n"

4
disabled-packages/man-db/build.sh
View File

@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Utilities for examining on-line help files (manual pages
TERMUX_PKG_VERSION=2.7.5 TERMUX_PKG_VERSION=2.7.5
TERMUX_PKG_REVISION=1 TERMUX_PKG_REVISION=1
TERMUX_PKG_SRCURL=http://mirror.csclub.uwaterloo.ca/nongnu/man-db/man-db-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SRCURL=http://mirror.csclub.uwaterloo.ca/nongnu/man-db/man-db-${TERMUX_PKG_VERSION}.tar.xz
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-db=gdbm --with-pager=less --with-config-file=/data/data/com.termux/files/usr/etc/man_db.conf --disable-setuid --with-browser=lynx --with-gzip=gzip --with-systemdtmpfilesdir=/data/data/com.termux/files/usr/lib/tmpfiles.d" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-db=gdbm --with-pager=less --with-config-file=${TERMUX_PREFIX}/etc/man_db.conf --disable-setuid --with-browser=lynx --with-gzip=gzip --with-systemdtmpfilesdir=${TERMUX_PREFIX}/lib/tmpfiles.d"
TERMUX_PKG_DEPENDS="flex, gdbm, groff, less, libandroid-support, libpipeline, lynx" TERMUX_PKG_DEPENDS="flex, gdbm, groff, less, libandroid-support, libpipeline, lynx"
export GROFF_TMAC_PATH="/data/data/com.termux/files/usr/lib/groff/site-tmac:/data/data/com.termux/files/usr/share/groff/site-tmac:/data/data/com.termux/files/usr/share/groff/current/tmac" export GROFF_TMAC_PATH="${TERMUX_PREFIX}/lib/groff/site-tmac:${TERMUX_PREFIX}/share/groff/site-tmac:${TERMUX_PREFIX}/share/groff/current/tmac"