From 9a7fd2168ce172fcd7111b1137c7e4808ce1f7c8 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Wed, 12 Jan 2011 19:45:10 +0100
Subject: fix cross-compile under Darwin, pass TARGET_CFLAGS to compilation

---
 package/lsof/Makefile                        |  6 ++--
 package/lsof/patches/patch-Configure         | 45 ++++++++++------------------
 package/lsof/patches/patch-lib_Makefile_skel | 11 +++++++
 3 files changed, 29 insertions(+), 33 deletions(-)
 create mode 100644 package/lsof/patches/patch-lib_Makefile_skel

(limited to 'package')

diff --git a/package/lsof/Makefile b/package/lsof/Makefile
index 8f0706031..f7cfb2b9b 100644
--- a/package/lsof/Makefile
+++ b/package/lsof/Makefile
@@ -5,15 +5,13 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		lsof
 PKG_VERSION:=		4.84
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		6dae655988c810a7042c06a4e2fa3c5f
 PKG_DESCR:=		list open files
 PKG_SECTION:=		misc
 PKG_URL:=		http://people.freebsd.org/~abe/
 PKG_SITES:=		ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/
 
-PKG_HOST_DEPENDS:=	!darwin
-
 DISTFILES:=             ${PKG_NAME}_${PKG_VERSION}.tar.gz
 WRKDIST=		${WRKDIR}/${PKG_NAME}_${PKG_VERSION}/${PKG_NAME}_${PKG_VERSION}_src
 
@@ -24,7 +22,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}'
+XAKE_FLAGS+=		CC='${TARGET_CC}' CFLAGS='${TARGET_CFLAGS}'
 INSTALL_STYLE:=		manual
 
 post-extract:
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	# }
diff --git a/package/lsof/patches/patch-lib_Makefile_skel b/package/lsof/patches/patch-lib_Makefile_skel
new file mode 100644
index 000000000..dc58ea4fa
--- /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
-- 
cgit v1.2.3