Package: smapi
Severity: important
Tags: patch
Hi,
currently your package FTBFS on GNU/kFreeBSD with the following error:
> gcc -Wall -c -s -O3 -fomit-frame-pointer -fstrength-reduce -fPIC -pedantic
> -DUNIX 1stchar.c
> In file included from 1stchar.c:22:
> compiler.h:2010:3: warning: #warning is a GCC extension
> compiler.h:2010:3: warning: #warning sleep() call undefined. Please check
> your compiler documentation for it and write "#define mysleep" into compiler.h
> compiler.h:2074:2: error: #error Our own mktime() not implemented yet...
> sorry.
> In file included from 1stchar.c:22:
> compiler.h:2082: warning: 'struct tm' declared inside parameter list
> compiler.h:2082: warning: its scope is only this definition or declaration,
> which is probably not what you want
> In file included from prog.h:24,
> from 1stchar.c:23:
> /usr/include/time.h:197: error: conflicting types for 'strftim'
> compiler.h:2082: error: previous declaration of 'strftim' was here
> make[1]: *** [1stchar.o] Error 1
> make[1]: Leaving directory `/build/buildd/smapi-2.4.0+rc2'
> make: *** [build-stamp] Error 2
Full build logs are available at
<http://experimental.ftbfs.de/build.php?arch=kfreebsd-i386&pkg=smapi>.
Please find attached a patch which adds some checks on __GLIBC__ since
the userlance is common to GNU/{Linux,kFreeBSD,Hurd} and the check on
linux (and other capitalizations, etc.) are too restrictive.
After having applied it, the package builds fine at least on
GNU/kFreeBSD (untested on GNU/Hurd), and obviously the patch should be
harmless to Linux builds.
Cheers,
--
Cyril Brulebois
--- smapi-2.4.0+rc2/compiler.h 2007-03-09 19:36:26.877161000 +0100
+++ smapi-2.4.0+rc2/compiler.h 2007-03-09 19:36:49.000000000 +0100
@@ -579,7 +579,7 @@
# endif
#endif
-#if defined(__linux__) || defined(__Linux__) || defined(linux) || defined(__linux) || defined(LINUX)
+#if defined(__linux__) || defined(__Linux__) || defined(linux) || defined(__linux) || defined(LINUX) || defined(__GLIBC__)
# if !defined(__LINUX__)
# define __LINUX__
# endif
--- smapi-2.4.0+rc2/strextra.c 2007-03-09 19:37:07.549829000 +0100
+++ smapi-2.4.0+rc2/strextra.c 2007-03-09 19:38:02.000000000 +0100
@@ -13,7 +13,7 @@
#include <ctype.h>
#include "strextra.h"
-#if !defined(_MSC_VER) && !defined(__linux__)
+#if !defined(_MSC_VER) && !defined(__linux__) && !defined(__GLIBC__)
int stricmp(const char *s, const char *t)
{
@@ -39,7 +39,7 @@
#endif
-#if !(defined(__APPLE__) && defined(__MACH__)) && !defined(__IBMC__) && !defined(__linux__) && !defined(__sun__) && !defined(__WATCOMC__) && !defined(_MSC_VER)
+#if !(defined(__APPLE__) && defined(__MACH__)) && !defined(__IBMC__) && !defined(__linux__) && !defined(__sun__) && !defined(__WATCOMC__) && !defined(_MSC_VER) && !defined(__GLIBC__)
char *strdup(const char *s)
{
