From 5a0db50ff645b0c57947ccedcd9d9400a2815d71 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Tue, 14 Apr 2015 22:50:42 +0000 Subject: [PATCH] Fix building with gcc-5 #546636. --- sys-process/lsof/ChangeLog | 5 ++++- sys-process/lsof/files/lsof-4.85-cross.patch | 6 +++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/sys-process/lsof/ChangeLog b/sys-process/lsof/ChangeLog index 266a4b34a916..2a0af6b19b2b 100644 --- a/sys-process/lsof/ChangeLog +++ b/sys-process/lsof/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sys-process/lsof # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-process/lsof/ChangeLog,v 1.110 2015/04/14 22:49:18 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-process/lsof/ChangeLog,v 1.111 2015/04/14 22:50:42 vapier Exp $ + + 14 Apr 2015; Mike Frysinger files/lsof-4.85-cross.patch: + Fix building with gcc-5 #546636. 14 Apr 2015; Mike Frysinger lsof-4.88.ebuild: Fix building with POSIX /bin/sh. diff --git a/sys-process/lsof/files/lsof-4.85-cross.patch b/sys-process/lsof/files/lsof-4.85-cross.patch index 186c6d8d6229..c2c73ccb563f 100644 --- a/sys-process/lsof/files/lsof-4.85-cross.patch +++ b/sys-process/lsof/files/lsof-4.85-cross.patch @@ -2,6 +2,10 @@ let the preprocessor work its magic rather than executing the code https://bugs.gentoo.org/432120 +make sure to use -P here + +https://bugs.gentoo.org/546636 + --- a/Configure +++ b/Configure @@ -2730,20 +2730,17 @@ LOCKF_OWNER4 @@ -22,7 +26,7 @@ https://bugs.gentoo.org/432120 -return(0); } .LSOF_END_HERE_DOC1 - $LINUX_CONF_CC ${LSOF_TMPC}.c -I$LSOF_INCLUDE -o ${LSOF_TMPC}.x > /dev/null 2>&1 -+ $LINUX_CONF_CC ${LSOF_TMPC}.c -E -I$LSOF_INCLUDE 2>/dev/null | sed -n '/^XXX:/s|.*:||p' > ${LSOF_TMPC}.x ++ $LINUX_CONF_CC ${LSOF_TMPC}.c -E -P -I$LSOF_INCLUDE 2>/dev/null | sed -n '/^XXX:/s|.*:||p' > ${LSOF_TMPC}.x - if test -x ${LSOF_TMPC}.x # { + if test -s ${LSOF_TMPC}.x # { then -- 2.26.2