summaryrefslogtreecommitdiff
path: root/package/lsof/patches
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2011-01-12 19:50:16 (GMT)
committerWaldemar Brodkorb <wbx@openadk.org>2011-01-12 19:50:16 (GMT)
commitc22db0379a20550bd17f8919b10b40b5ef7d03b1 (patch)
treed8fc4258c443bab8c25ef4262ff3b278c9a6c782 /package/lsof/patches
parent1cfd01852aa45f83506ba67ea3528495918115b3 (diff)
parent2a52a8ea1a405a82ee6640253603067fd5b4fcef (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/lsof/patches')
-rw-r--r--package/lsof/patches/patch-Configure45
-rw-r--r--package/lsof/patches/patch-lib_Makefile_skel11
2 files changed, 27 insertions, 29 deletions
diff --git a/package/lsof/patches/patch-Configure b/package/lsof/patches/patch-Configure
index e990012..2d9635b 100644
--- a/package/lsof/patches/patch-Configure
+++ b/package/lsof/patches/patch-Configure
@@ -1,30 +1,17 @@
--- lsof_4.84_src.orig/Configure 2010-07-29 17:59:32.000000000 +0200
-+++ lsof_4.84_src/Configure 2010-10-07 20:03:14.000000000 +0200
-@@ -2739,27 +2739,6 @@ return(0); }
- then
- LSOF_CFGF="$LSOF_CFGF -DHASIPv6"
- 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 # }
- LSOF_DIALECT_DIR="linux"
- LSOF_CFGF="$LSOF_CFGF -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE"
- ;;
++++ lsof_4.84_src/Configure 2011-01-12 19:42:53.000000000 +0100
+@@ -5357,12 +5357,12 @@ then
+ if test "X$LSOF_RANLIB" != "X" # {
+ then
+ echo "" >> ${LSOF_LIB}/$LSOF_LIBMKF
+- echo "RANLIB= $LSOF_RANLIB \${LIB}" >> ${LSOF_LIB}/$LSOF_LIBMKF
++ echo "RANLIB?= $LSOF_RANLIB" >> ${LSOF_LIB}/$LSOF_LIBMKF
+ fi # }
+ echo "" >> ${LSOF_LIB}/$LSOF_LIBMKF
+ if test "X$LSOF_CFLAGS_OVERRIDE" = "X" # {
+ then
+- echo "CFLAGS= \${CDEFS} \${INCL} \${DEBUG}" >> ${LSOF_LIB}/$LSOF_LIBMKF
++ echo "CFLAGS?= \${CDEFS} \${INCL} \${DEBUG}" >> ${LSOF_LIB}/$LSOF_LIBMKF
+ else
+ echo "override CFLAGS=\${CDEFS} \${INCL} \${DEBUG}" >> ${LSOF_LIB}/$LSOF_LIBMKF
+ fi # }
diff --git a/package/lsof/patches/patch-lib_Makefile_skel b/package/lsof/patches/patch-lib_Makefile_skel
new file mode 100644
index 0000000..dc58ea4
--- /dev/null
+++ b/package/lsof/patches/patch-lib_Makefile_skel
@@ -0,0 +1,11 @@
+--- lsof_4.84_src.orig/lib/Makefile.skel 2001-02-13 03:12:22.000000000 +0100
++++ lsof_4.84_src/lib/Makefile.skel 2011-01-12 19:42:17.000000000 +0100
+@@ -22,7 +22,7 @@ all: ${LIB}
+
+ ${LIB}: ${OBJ}
+ ${AR}
+- ${RANLIB}
++ ${RANLIB} ${LIB}
+
+ clean: FRC
+ rm -f ${LIB} ${OBJ} errs Makefile.bak a.out core