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

lsof: avoid overriding termux_step_make

Browse Source 
And update patch offsets.
This commit is contained in:
Henrik Grimler 2021-11-08 21:00:36 +01:00
parent 03fc44d615
commit 2ab8f872d1
No known key found for this signature in database
GPG Key ID: B0076E490B71616B
2 changed files with 10 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
packages/lsof/Configure.patch
View File

@ -1,6 +1,5 @@
diff -uNr lsof-4.93.2/Configure lsof-4.93.2.mod/Configure
--- lsof-4.93.2/Configure 2019-05-08 10:32:25.000000000 +0300
+++ lsof-4.93.2.mod/Configure 2020-06-07 03:20:36.117487707 +0300
--- ../Configure.orig 2021-11-08 19:52:16.878340986 +0000
+++ ./Configure 2021-11-08 19:53:37.598405439 +0000
@@ -2976,27 +2976,6 @@
fi #}
fi # }
@ -29,47 +28,12 @@ diff -uNr lsof-4.93.2/Configure lsof-4.93.2.mod/Configure
# Test for UNIX socket endpoint support.
if test -r ${LSOF_INCLUDE}/linux/sock_diag.h -a -r ${LSOF_INCLUDE}/linux/unix_diag.h # {
@@ -5617,7 +5596,7 @@
if test "X$LSOF_LIB_NO" = "X" # {
then
echo "" >> $LSOF_MKFC
- echo "CFGL= $LSOF_FCFGL -L./$LSOF_LIB -llsof $LSOF_CFGL" >> $LSOF_MKFC
+ echo "CFGL= $LSOF_FCFGL -Wl,-rpath=@TERMUX_PREFIX@/lib,--enable-new-dtags -L./$LSOF_LIB -llsof -L@TERMUX_PREFIX@/lib -ltirpc -landroid-support $LSOF_CFGL" >> $LSOF_MKFC
fi # }
echo "" >> $LSOF_MKFC
if test "X$LSOF_DEBUG" = "X" # {
diff -uNr lsof-4.93.2/OLD/Configure lsof-4.93.2.mod/OLD/Configure
--- lsof-4.93.2/OLD/Configure 2019-05-08 10:32:25.000000000 +0300
+++ lsof-4.93.2.mod/OLD/Configure 2020-06-07 03:20:49.621626530 +0300
@@ -2961,27 +2961,6 @@
fi #}
fi # }
- # Test for SELinux support.
-
- LSOF_TMP1=0
- if test "X$LINUX_HASSELINUX" = "X" # {
- then
- if test -r ${LSOF_INCLUDE}/selinux/selinux.h # {
- then
- LSOF_TMP1=1
- fi # }
- else
- if test "X$LINUX_HASSELINUX" = "XY" -o "X$LINUX_HASSELINUX" = "Xy" # {
- then
- LSOF_TMP1=1
- fi # }
- fi # }
- if test $LSOF_TMP1 -eq 1 # {
- then
- LSOF_CFGF="$LSOF_CFGF -DHASSELINUX"
- LSOF_CFGL="$LSOF_CFGL -lselinux"
- fi # }
-
# Test for UNIX socket endpoint support.
if test -r ${LSOF_INCLUDE}/linux/sock_diag.h -a -r ${LSOF_INCLUDE}/linux/unix_diag.h # {
@@ -5591,7 +5570,7 @@
@@ -5625,11 +5604,11 @@
LSOF_CFGF="$LSOF_CFGF -DLSOF_VSTR=\\\"$LSOF_TMP\\\""
fi # }
echo "" >> $LSOF_MKFC
-echo "CFGF= $LSOF_CFGF" >> $LSOF_MKFC
+echo "CFGF= $LSOF_CFGF -I@TERMUX_PREFIX@/include/tirpc" >> $LSOF_MKFC
if test "X$LSOF_LIB_NO" = "X" # {
then
echo "" >> $LSOF_MKFC

7
packages/lsof/build.sh
View File

@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Lists open files for running Unix processes"
TERMUX_PKG_LICENSE="custom"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=4.94.0
TERMUX_PKG_REVISION=1
TERMUX_PKG_SRCURL=https://github.com/lsof-org/lsof/archive/${TERMUX_PKG_VERSION}/lsof-${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_SHA256=a9865eeb581c3abaac7426962ddb112ecfd86a5ae93086eb4581ce100f8fa8f4
TERMUX_PKG_AUTO_UPDATE=true
@ -10,11 +11,7 @@ TERMUX_PKG_DEPENDS="libandroid-support, libtirpc"
TERMUX_PKG_BUILD_IN_SRC=true
termux_step_configure() {
./Configure -n linux
}
termux_step_make() {
make CC="$CC $CFLAGS $CPPFLAGS -I$TERMUX_PREFIX/include/tirpc"
LSOF_CC="$CC" ./Configure -n linux
}
termux_step_make_install() {