[Pkg-octave-devel] Bug#415102: octplot: FTBFS on GNU/kFreeBSD: tiny tweak needed

[Cyril Brulebois]

Package: octplot
Version: 0.3.9-2
Severity: important
Tags: patch

Hi,

currently your package FTBFS on GNU/kFreeBSD with the following error:
> g++ -DHAVE_CONFIG_H -I. -I. -I..     -I/usr/include/freetype2 -I/usr/include/freetype2 -g -Wall -O2 -fPIC -c -o octplot-FTVectoriser.o `test -f 'FTGL/FTVectoriser.cpp' || echo './'`FTGL/FTVectoriser.cpp
> FTGL/FTVectoriser.cpp:15:6: error: #error "Error - need to define type GLUTesselatorFunction for this platform/compiler"
> FTGL/FTVectoriser.cpp: In member function 'void FTVectoriser::MakeMesh(FTGL_DOUBLE)':
> FTGL/FTVectoriser.cpp:186: error: 'GLUTesselatorFunction' was not declared in this scope
> FTGL/FTVectoriser.cpp:187: error: expected `)' before 'ftglVertex'
> FTGL/FTVectoriser.cpp:188: error: expected `)' before 'ftglCombine'
> FTGL/FTVectoriser.cpp:189: error: expected `)' before 'ftglEnd'
> FTGL/FTVectoriser.cpp:190: error: expected `)' before 'ftglError'
> make[3]: *** [octplot-FTVectoriser.o] Error 1

Full build logs are available at
<http://experimental.ftbfs.de/build.php?arch=kfreebsd-i386&pkg=octplot>.

Please find attached a tiny patch to fix this, based on the __GLIBC__ macro
defined on GNU/k*BSD platforms. If upstream finds it not suitable,
__FreeBSD_kernel__ can also be used, although less portable.

Cheers,

-- 
Cyril Brulebois
-------------- next part --------------
--- octplot-0.3.9/src/FTGL/FTVectoriser.cpp	2007-03-16 05:21:01.348033000 +0100
+++ octplot-0.3.9/src/FTGL/FTVectoriser.cpp	2007-03-16 05:24:29.000000000 +0100
@@ -9,7 +9,7 @@
     typedef GLvoid (*GLUTesselatorFunction)(...);
 #elif defined ( WIN32)
     typedef GLvoid (CALLBACK *GLUTesselatorFunction)( );
-#elif defined( __mips ) || defined( __linux__ ) || defined( __FreeBSD__ ) || defined( __OpenBSD__ ) || defined( __sun ) || defined (__CYGWIN__)
+#elif defined( __mips ) || defined( __linux__ ) || defined( __FreeBSD__ ) || defined( __OpenBSD__ ) || defined( __sun ) || defined (__CYGWIN__) || defined(__GLIBC__)
     typedef GLvoid (*GLUTesselatorFunction)();
 #else
     #error "Error - need to define type GLUTesselatorFunction for this platform/compiler"