[gentoo-commits] gentoo-x86 commit in sys-process/lsof/files: lsof-4.85-cross.patch

[Mike Frysinger (vapier)]

vapier      12/08/22 04:03:33

  Added:                lsof-4.85-cross.patch
  Log:
  Fix cross-compiling by avoiding executing compiled configure tests #432120 by Dennis Schridde.
  
  (Portage version: 2.2.0_alpha120/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  sys-process/lsof/files/lsof-4.85-cross.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-process/lsof/files/lsof-4.85-cross.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-process/lsof/files/lsof-4.85-cross.patch?rev=1.1&content-type=text/plain

Index: lsof-4.85-cross.patch
===================================================================
let the preprocessor work its magic rather than executing the code

https://bugs.gentoo.org/432120

--- a/Configure
+++ b/Configure
@@ -2730,20 +2730,17 @@ LOCKF_OWNER4
       rm -f ${LSOF_TMPC}.*
       cat > $LSOF_TMPC.c << .LSOF_END_HERE_DOC1
 #include <features.h>
-main() {
+#undef XXX
 #if defined(__GLIBC__) && defined(__GLIBC_MINOR__)
-printf("-DGLIBCV=%d\n",__GLIBC__*100+__GLIBC_MINOR__);
+XXX: __GLIBC__ * 100 + __GLIBC_MINOR__
 #elif defined(__GLIBC__)
-printf("-DGLIBCV=%d00\n",__GLIBC__);
-#else
-printf("\n");
+XXX: __GLIBC__ * 100
 #endif
-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
-      if test -x ${LSOF_TMPC}.x	# {
+      if test -s ${LSOF_TMPC}.x	# {
       then
-	LINUX_CLIB=`${LSOF_TMPC}.x`
+	LINUX_CLIB="-DGLIBCV=$(( `cat ${LSOF_TMPC}.x` ))"
 	LSOF_TMP=$?
       else
 	LINUX_CLIB=""