From 15c84adca94bfe4a89ece5c04f06a884cf508ebb Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 17 Jan 2011 21:55:49 +0100 Subject: fix packages to be compile with stack protector - libtool do not pass -fstack-protector while linking, but this is required to successfully link libraries or executables with SSP - pass LDFLAGS for non-libtool packages --- package/lsof/Makefile | 5 +++-- package/lsof/patches/patch-Configure | 17 ----------------- package/lsof/patches/patch-dialects_linux_dlsof_h | 16 ---------------- package/lsof/patches/patch-dialects_linux_machine_h | 10 ---------- package/lsof/patches/patch-lib_Makefile_skel | 11 ----------- 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 +++++++++++ 9 files changed, 57 insertions(+), 56 deletions(-) delete mode 100644 package/lsof/patches/patch-Configure delete mode 100644 package/lsof/patches/patch-dialects_linux_dlsof_h delete mode 100644 package/lsof/patches/patch-dialects_linux_machine_h delete mode 100644 package/lsof/patches/patch-lib_Makefile_skel create mode 100644 package/lsof/patches/patch-lsof_4_84_src_Configure create mode 100644 package/lsof/patches/patch-lsof_4_84_src_dialects_linux_dlsof_h create mode 100644 package/lsof/patches/patch-lsof_4_84_src_dialects_linux_machine_h create mode 100644 package/lsof/patches/patch-lsof_4_84_src_lib_Makefile_skel (limited to 'package/lsof') diff --git a/package/lsof/Makefile b/package/lsof/Makefile index f7cfb2b9b..8bad858ae 100644 --- a/package/lsof/Makefile +++ b/package/lsof/Makefile @@ -13,7 +13,8 @@ PKG_URL:= http://people.freebsd.org/~abe/ PKG_SITES:= ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/ DISTFILES:= ${PKG_NAME}_${PKG_VERSION}.tar.gz -WRKDIST= ${WRKDIR}/${PKG_NAME}_${PKG_VERSION}/${PKG_NAME}_${PKG_VERSION}_src +WRKDIST= ${WRKDIR}/${PKG_NAME}_${PKG_VERSION} +WRKSRC= ${WRKDIR}/${PKG_NAME}_${PKG_VERSION}/${PKG_NAME}_${PKG_VERSION}_src include $(TOPDIR)/mk/package.mk @@ -22,7 +23,7 @@ $(eval $(call PKG_template,LSOF,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_ CONFIG_STYLE:= minimal CONFIGURE_PROG:= Configure CONFIGURE_ARGS:= -n linux -XAKE_FLAGS+= CC='${TARGET_CC}' CFLAGS='${TARGET_CFLAGS}' +XAKE_FLAGS+= CC='${TARGET_CC}' CFLAGS='${TARGET_CFLAGS}' CFGL='${TARGET_LDFLAGS} -L./lib -llsof' INSTALL_STYLE:= manual post-extract: diff --git a/package/lsof/patches/patch-Configure b/package/lsof/patches/patch-Configure deleted file mode 100644 index 2d9635b2c..000000000 --- a/package/lsof/patches/patch-Configure +++ /dev/null @@ -1,17 +0,0 @@ ---- lsof_4.84_src.orig/Configure 2010-07-29 17:59:32.000000000 +0200 -+++ 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-dialects_linux_dlsof_h b/package/lsof/patches/patch-dialects_linux_dlsof_h deleted file mode 100644 index 1b6314849..000000000 --- a/package/lsof/patches/patch-dialects_linux_dlsof_h +++ /dev/null @@ -1,16 +0,0 @@ ---- lsof_4.84_src.orig/dialects/linux/dlsof.h 2010-01-18 20:03:19.000000000 +0100 -+++ lsof_4.84_src/dialects/linux/dlsof.h 2010-10-07 20:35:57.000000000 +0200 -@@ -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-dialects_linux_machine_h b/package/lsof/patches/patch-dialects_linux_machine_h deleted file mode 100644 index 011144644..000000000 --- a/package/lsof/patches/patch-dialects_linux_machine_h +++ /dev/null @@ -1,10 +0,0 @@ ---- lsof_4.84_src.orig/dialects/linux/machine.h 2010-07-29 18:02:52.000000000 +0200 -+++ lsof_4.84_src/dialects/linux/machine.h 2010-10-07 20:03:14.000000000 +0200 -@@ -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-lib_Makefile_skel b/package/lsof/patches/patch-lib_Makefile_skel deleted file mode 100644 index dc58ea4fa..000000000 --- a/package/lsof/patches/patch-lib_Makefile_skel +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 diff --git a/package/lsof/patches/patch-lsof_4_84_src_Configure b/package/lsof/patches/patch-lsof_4_84_src_Configure new file mode 100644 index 000000000..b1ca02fef --- /dev/null +++ b/package/lsof/patches/patch-lsof_4_84_src_Configure @@ -0,0 +1,17 @@ +--- 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 new file mode 100644 index 000000000..b15a001b1 --- /dev/null +++ b/package/lsof/patches/patch-lsof_4_84_src_dialects_linux_dlsof_h @@ -0,0 +1,16 @@ +--- 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 new file mode 100644 index 000000000..6066b38d8 --- /dev/null +++ b/package/lsof/patches/patch-lsof_4_84_src_dialects_linux_machine_h @@ -0,0 +1,10 @@ +--- 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 new file mode 100644 index 000000000..8cada0635 --- /dev/null +++ b/package/lsof/patches/patch-lsof_4_84_src_lib_Makefile_skel @@ -0,0 +1,11 @@ +--- 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 -- cgit v1.2.3