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

fix Termux hardcoded directories in nim, xorg-util-macros

Browse Source
This commit is contained in:
Leonid Pliushch 2020-10-30 22:22:20 +02:00
parent b09fd04686
commit 2644357818
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/nim/build.sh
View File

@ -31,7 +31,7 @@ termux_step_make() {
sed -i "s%\@LDFLAGS\@%${LDFLAGS}%g" config/nim.cfg
sed -i "s%\@CPPFLAGS\@%${CPPFLAGS}%g" config/nim.cfg
find -name "stdlib_osproc.nim.c" | xargs -n 1 sed -i 's',"/system/bin/sh\"\,\ 14","/data/data/com.termux/files/usr/bin/sh\"\,\ 38",'g'
find -name "stdlib_osproc.nim.c" | xargs -n 1 sed -i 's',"/system/bin/sh\"\,\ 14","${TERMUX_PREFIX}/bin/sh\"\,\ 38",'g'
PATH=$TERMUX_PKG_HOSTBUILD_DIR/bin:$PATH
if [ $NIM_ARCH = "amd64" ]; then

4
packages/xorg-util-macros/util-macros-1.19.1_xorg-macros.m4.in.patch
View File

@ -6,7 +6,7 @@ diff -uNr util-macros-1.19.1/xorg-macros.m4.in util-macros-1.19.1.mod/xorg-macro
AC_REQUIRE([AC_PROG_CPP])
AC_PATH_PROGS(RAWCPP, [cpp], [${CPP}],
- [$PATH:/bin:/usr/bin:/usr/lib:/usr/libexec:/usr/ccs/lib:/usr/ccs/lbin:/lib])
+ [$PATH:/data/data/com.termux/files/usr/bin:/data/data/com.termux/files/usr/lib:/usr/bin:/usr/lib:/bin:/lib])
+ [$PATH:@TERMUX_PREFIX@/bin:@TERMUX_PREFIX@/lib:/usr/bin:/usr/lib:/bin:/lib])
# Check for flag to avoid builtin definitions - assumes unix is predefined,
# which is not the best choice for supporting other OS'es, but covers most
@ -15,7 +15,7 @@ diff -uNr util-macros-1.19.1/xorg-macros.m4.in util-macros-1.19.1.mod/xorg-macro
ac_cv_path_M4=$ac_path_M4 ac_path_M4_found=:]],
[AC_MSG_ERROR([could not find m4 that supports -I option])],
- [$PATH:/usr/gnu/bin])])
+ [$PATH:/data/data/com.termux/files/usr/bin:/usr/bin:/bin])])
+ [$PATH:@TERMUX_PREFIX@/bin:/usr/bin:/bin])])
AC_SUBST([M4], [$ac_cv_path_M4])
]) # XORG_WITH_M4