From 9a7fd2168ce172fcd7111b1137c7e4808ce1f7c8 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 12 Jan 2011 19:45:10 +0100 Subject: fix cross-compile under Darwin, pass TARGET_CFLAGS to compilation --- package/lsof/patches/patch-Configure | 45 +++++++++++++----------------------- 1 file changed, 16 insertions(+), 29 deletions(-) (limited to 'package/lsof/patches/patch-Configure') diff --git a/package/lsof/patches/patch-Configure b/package/lsof/patches/patch-Configure index e99001293..2d9635b2c 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 # } -- cgit v1.2.3 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/patches/patch-Configure | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 package/lsof/patches/patch-Configure (limited to 'package/lsof/patches/patch-Configure') 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 # } -- cgit v1.2.3