From afaf39d3d4bd5037cb4869237639e3490b3ad198 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 6 Jun 2017 02:07:09 +0200 Subject: lsof: fix glibc compile error, reported by Martin T. --- package/lsof/patches/patch-lsof_4_84_src_Configure | 17 ----------------- .../patches/patch-lsof_4_84_src_dialects_linux_dlsof_h | 16 ---------------- .../patch-lsof_4_84_src_dialects_linux_machine_h | 10 ---------- .../lsof/patches/patch-lsof_4_84_src_lib_Makefile_skel | 11 ----------- .../patches/patch-lsof_4_89_src_dialects_linux_dlsof_h | 15 +++++++++++++++ 5 files changed, 15 insertions(+), 54 deletions(-) delete mode 100644 package/lsof/patches/patch-lsof_4_84_src_Configure delete mode 100644 package/lsof/patches/patch-lsof_4_84_src_dialects_linux_dlsof_h delete mode 100644 package/lsof/patches/patch-lsof_4_84_src_dialects_linux_machine_h delete mode 100644 package/lsof/patches/patch-lsof_4_84_src_lib_Makefile_skel create mode 100644 package/lsof/patches/patch-lsof_4_89_src_dialects_linux_dlsof_h (limited to 'package/lsof/patches') diff --git a/package/lsof/patches/patch-lsof_4_84_src_Configure b/package/lsof/patches/patch-lsof_4_84_src_Configure deleted file mode 100644 index b1ca02fef..000000000 --- a/package/lsof/patches/patch-lsof_4_84_src_Configure +++ /dev/null @@ -1,17 +0,0 @@ ---- lsof_4.84.orig/lsof_4.84_src/Configure 2010-07-29 17:59:32.000000000 +0200 -+++ lsof_4.84/lsof_4.84_src/Configure 2011-01-15 23:57:34.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-lsof_4_84_src_dialects_linux_dlsof_h b/package/lsof/patches/patch-lsof_4_84_src_dialects_linux_dlsof_h deleted file mode 100644 index b15a001b1..000000000 --- a/package/lsof/patches/patch-lsof_4_84_src_dialects_linux_dlsof_h +++ /dev/null @@ -1,16 +0,0 @@ ---- lsof_4.84.orig/lsof_4.84_src/dialects/linux/dlsof.h 2010-01-18 20:03:19.000000000 +0100 -+++ lsof_4.84/lsof_4.84_src/dialects/linux/dlsof.h 2011-01-16 00:01:43.000000000 +0100 -@@ -49,13 +49,7 @@ - #include - #include - #include -- --# if defined(GLIBCV) || defined(__UCLIBC__) - #include --# else /* !defined(GLIBCV) && !defined(__UCLIBC__) */ --#include --# endif /* defined(GLIBCV) || defined(__UCLIBC__) */ -- - #include - #include - diff --git a/package/lsof/patches/patch-lsof_4_84_src_dialects_linux_machine_h b/package/lsof/patches/patch-lsof_4_84_src_dialects_linux_machine_h deleted file mode 100644 index 6066b38d8..000000000 --- a/package/lsof/patches/patch-lsof_4_84_src_dialects_linux_machine_h +++ /dev/null @@ -1,10 +0,0 @@ ---- lsof_4.84.orig/lsof_4.84_src/dialects/linux/machine.h 2010-07-29 18:02:52.000000000 +0200 -+++ lsof_4.84/lsof_4.84_src/dialects/linux/machine.h 2011-01-16 00:01:48.000000000 +0100 -@@ -632,6 +632,6 @@ - * zeromem is a macro that uses bzero or memset. - */ - --#define zeromem(a, l) bzero(a, l) -+#define zeromem(a, l) memset(a, 0, l) - - #endif /* !defined(LSOF_MACHINE_H) */ diff --git a/package/lsof/patches/patch-lsof_4_84_src_lib_Makefile_skel b/package/lsof/patches/patch-lsof_4_84_src_lib_Makefile_skel deleted file mode 100644 index 8cada0635..000000000 --- a/package/lsof/patches/patch-lsof_4_84_src_lib_Makefile_skel +++ /dev/null @@ -1,11 +0,0 @@ ---- lsof_4.84.orig/lsof_4.84_src/lib/Makefile.skel 2001-02-13 03:12:22.000000000 +0100 -+++ lsof_4.84/lsof_4.84_src/lib/Makefile.skel 2011-01-15 23:58:50.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 diff --git a/package/lsof/patches/patch-lsof_4_89_src_dialects_linux_dlsof_h b/package/lsof/patches/patch-lsof_4_89_src_dialects_linux_dlsof_h new file mode 100644 index 000000000..52e87b77e --- /dev/null +++ b/package/lsof/patches/patch-lsof_4_89_src_dialects_linux_dlsof_h @@ -0,0 +1,15 @@ +--- lsof_4.89.orig/lsof_4.89_src/dialects/linux/dlsof.h 2015-07-07 21:47:05.000000000 +0200 ++++ lsof_4.89/lsof_4.89_src/dialects/linux/dlsof.h 2017-06-06 02:02:34.512010265 +0200 +@@ -49,12 +49,7 @@ + #include + #include + #include +- +-# if defined(GLIBCV) || defined(__UCLIBC__) || defined(NEEDS_NETINET_TCPH) + #include +-# else /* !defined(GLIBCV) && !defined(__UCLIBC__) && !defined(NEEDS_NETINET_TCPH) */ +-#include +-# endif /* defined(GLIBCV) || defined(__UCLIBC__) || defined(NEEDS_NETINET_TCPH) */ + + # if !defined(HASNORPC_H) + #include -- cgit v1.2.3