Re: graphics/MesaLib build failure with gcc 4.9.2 on Solaris 10 sparc

[Tobias Nygren <tnn%NetBSD.org@localhost>]

On Mon, 11 May 2015 13:31:22 -0700
Ibraheem Saleh <shadowhawk100%gmail.com@localhost> wrote:

> I'm trying to build pkgsrc MesaLib with external gcc 4.9.2 on Solaris
> 10 and am stopping with the following error:
> 
> ../../src/gallium/auxiliary/util/u_math.h: In function 'u_bit_scan64':
> ../../src/gallium/auxiliary/util/u_math.h:594:4: error: implicit
> declaration of function 'ffsll'

Hello,

Please try this change:

--- patches/patch-src_gallium_auxiliary_util_u__math.h	25 Apr 2015 11:19:18 -0000	1.1
+++ patches/patch-src_gallium_auxiliary_util_u__math.h	11 May 2015 20:59:32 -0000
@@ -3,18 +3,20 @@
 The C99 "restrict" keyword is not valid in C++, but most compilers will
 understand __restrict.
 
---- src/gallium/auxiliary/util/u_math.h.orig	2015-03-28 18:20:39.000000000 +0000
+--- src/gallium/auxiliary/util/u_math.h.orig   2015-03-28 18:20:39.000000000 +0000
 +++ src/gallium/auxiliary/util/u_math.h
-@@ -531,6 +531,9 @@ unsigned ffs( unsigned u )
- #elif defined(__MINGW32__) || defined(PIPE_OS_ANDROID)
- #define ffs __builtin_ffs
- #define ffsll __builtin_ffsll
+@@ -528,7 +528,10 @@ unsigned ffs( unsigned u )
+ 
+    return i;
+ }
+-#elif defined(__MINGW32__) || defined(PIPE_OS_ANDROID)
 +#elif defined(__NetBSD__)
 +#include <sys/bitops.h>
 +#define ffsll ffs64
++#elif defined(__GNUC__)
+ #define ffs __builtin_ffs
+ #define ffsll __builtin_ffsll
  #endif
- 
- #endif /* FFS_DEFINED */
 @@ -821,6 +824,11 @@ util_bswap16(uint16_t n)
            (n << 8);
  }
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/MesaLib/distinfo,v
retrieving revision 1.91
diff -u -r1.91 distinfo
--- distinfo	29 Apr 2015 14:12:54 -0000	1.91
+++ distinfo	11 May 2015 20:59:32 -0000
@@ -6,7 +6,7 @@
 SHA1 (patch-configure) = 3fc150370e36fc49382b491d907608f00cf99a72
 SHA1 (patch-include_GL_glxext.h) = 830902f2d38a8395cda682c059fc5223e1b0e89e
 SHA1 (patch-src_gallium_auxiliary_util_u__format__tests.c) = 4d5e4677c2825778c43440ab131b8807f6840975
-SHA1 (patch-src_gallium_auxiliary_util_u__math.h) = a48959f10f09decfaf66180bd69c84ac518cd9d9
+SHA1 (patch-src_gallium_auxiliary_util_u__math.h) = b126390d4a8ee495edfb4c3b1dfdab981445969e
 SHA1 (patch-src_gallium_auxiliary_util_u__network.c) = 283f505af780071dc9fd7914f8065e3fb7d8a4fd
 SHA1 (patch-src_gallium_auxiliary_util_u__network.h) = c6106d67b4fa9db0d790474182d6e0ce0c5da677
 SHA1 (patch-src_gallium_drivers_nouveau_codegen_nv50__ir__peephole.cpp) = 5fc2ef7eafac3006896af96bac8176c79b17cfdc
Index: patches/patch-src_gallium_auxiliary_util_u__math.h