summaryrefslogtreecommitdiff
path: root/package/lsof
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2011-01-17 20:55:49 (GMT)
committerWaldemar Brodkorb <wbx@openadk.org>2011-01-17 20:55:49 (GMT)
commit15c84adca94bfe4a89ece5c04f06a884cf508ebb (patch)
tree727d3fd768a1abe75521190b90833b3a68cce4c6 /package/lsof
parent0de5d9ecedff55481b3c1eb9c3841de17716a485 (diff)
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
Diffstat (limited to 'package/lsof')
-rw-r--r--package/lsof/Makefile5
-rw-r--r--package/lsof/patches/patch-lib_Makefile_skel11
-rw-r--r--package/lsof/patches/patch-lsof_4_84_src_Configure (renamed from package/lsof/patches/patch-Configure)4
-rw-r--r--package/lsof/patches/patch-lsof_4_84_src_dialects_linux_dlsof_h (renamed from package/lsof/patches/patch-dialects_linux_dlsof_h)4
-rw-r--r--package/lsof/patches/patch-lsof_4_84_src_dialects_linux_machine_h (renamed from package/lsof/patches/patch-dialects_linux_machine_h)4
-rw-r--r--package/lsof/patches/patch-lsof_4_84_src_lib_Makefile_skel11
6 files changed, 20 insertions, 19 deletions
diff --git a/package/lsof/Makefile b/package/lsof/Makefile
index f7cfb2b..8bad858 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-lib_Makefile_skel b/package/lsof/patches/patch-lib_Makefile_skel
deleted file mode 100644
index dc58ea4..0000000
--- 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-Configure b/package/lsof/patches/patch-lsof_4_84_src_Configure
index 2d9635b..b1ca02f 100644
--- a/package/lsof/patches/patch-Configure
+++ b/package/lsof/patches/patch-lsof_4_84_src_Configure
@@ -1,5 +1,5 @@
---- 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
+--- 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
diff --git a/package/lsof/patches/patch-dialects_linux_dlsof_h b/package/lsof/patches/patch-lsof_4_84_src_dialects_linux_dlsof_h
index 1b63148..b15a001 100644
--- a/package/lsof/patches/patch-dialects_linux_dlsof_h
+++ b/package/lsof/patches/patch-lsof_4_84_src_dialects_linux_dlsof_h
@@ -1,5 +1,5 @@
---- 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
+--- 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 <setjmp.h>
#include <unistd.h>
diff --git a/package/lsof/patches/patch-dialects_linux_machine_h b/package/lsof/patches/patch-lsof_4_84_src_dialects_linux_machine_h
index 0111446..6066b38 100644
--- a/package/lsof/patches/patch-dialects_linux_machine_h
+++ b/package/lsof/patches/patch-lsof_4_84_src_dialects_linux_machine_h
@@ -1,5 +1,5 @@
---- 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
+--- 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.
*/
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 0000000..8cada06
--- /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