Package: cadaver
Severity: normal
Tags: patch
When building 'cadaver' on amd64 with gcc-4.0,
I get the following error:
make[1]: Entering directory `/cadaver-0.22.2'
gcc -DHAVE_CONFIG_H -I/usr/include/libxml2 -I. -I./lib -I./src -g -O2
-I./libneon -Wall -ansi-pedantic -Wmissing-declarations -Winline -Wshadow
-Wreturn-type -Wsign-compare -Wundef -Wpointer-arith -Wcast-align
-Wbad-function-cast -Wformat-security -Wstrict-prototypes -o src/cadaver.o -c
src/cadaver.c
cc1: error: unrecognized command line option "-ansi-pedantic"
make[1]: *** [src/cadaver.o] Error 1
make[1]: Leaving directory `/cadaver-0.22.2'
make: *** [build] Error 2
With the attached patch 'cadaver' can be compiled
on amd64 using gcc-4.0.
The attached patch also updates the Build-Depends in debian/control
to use 'libreadline5-dev'.
Regards
Andreas Jochens
diff -urN ../tmp-orig/cadaver-0.22.2/configure ./configure
--- ../tmp-orig/cadaver-0.22.2/configure 2005-02-08 23:51:17.795836915
+0100
+++ ./configure 2005-02-08 23:04:10.000000000 +0100
@@ -15652,7 +15652,7 @@
if test "$enable_warnings" = "yes"; then
case $GCC:`uname` in
yes:*)
- CFLAGS="$CFLAGS -Wall -ansi-pedantic -Wmissing-declarations -Winline
-Wshadow -Wreturn-type -Wsign-compare -Wundef -Wpointer-arith -Wcast-align
-Wbad-function-cast -Wformat-security"
+ CFLAGS="$CFLAGS -Wall -Wmissing-declarations -Winline -Wshadow
-Wreturn-type -Wsign-compare -Wundef -Wpointer-arith -Wcast-align
-Wbad-function-cast -Wformat-security"
if test -z "$with_ssl" -o "$with_ssl" = "no"; then
# OpenSSL headers fail strict prototypes checks
CFLAGS="$CFLAGS -Wstrict-prototypes"
diff -urN ../tmp-orig/cadaver-0.22.2/macros/neon.m4 ./macros/neon.m4
--- ../tmp-orig/cadaver-0.22.2/macros/neon.m4 2005-02-08 23:51:17.790837880
+0100
+++ ./macros/neon.m4 2005-02-08 23:03:46.000000000 +0100
@@ -829,7 +829,7 @@
if test "$enable_warnings" = "yes"; then
case $GCC:`uname` in
yes:*)
- CFLAGS="$CFLAGS -Wall -ansi-pedantic -Wmissing-declarations -Winline
-Wshadow -Wreturn-type -Wsign-compare -Wundef -Wpointer-arith -Wcast-align
-Wbad-function-cast -Wformat-security"
+ CFLAGS="$CFLAGS -Wall -Wmissing-declarations -Winline -Wshadow
-Wreturn-type -Wsign-compare -Wundef -Wpointer-arith -Wcast-align
-Wbad-function-cast -Wformat-security"
if test -z "$with_ssl" -o "$with_ssl" = "no"; then
# OpenSSL headers fail strict prototypes checks
CFLAGS="$CFLAGS -Wstrict-prototypes"
diff -urN ../tmp-orig/cadaver-0.22.2/debian/control ./debian/control
--- ../tmp-orig/cadaver-0.22.2/debian/control 2005-02-08 23:51:17.796836722
+0100
+++ ./debian/control 2005-02-08 23:00:22.000000000 +0100
@@ -2,7 +2,7 @@
Section: web
Priority: optional
Maintainer: Bernd Eckenfels <[EMAIL PROTECTED]>
-Build-Depends: libncurses5-dev, libxml2-dev | libxml-dev, libreadline4-dev
(>=4.1), zlib1g-dev (>= 1:1.1.3), libssl-dev (>= 0.9.6f), debmake
+Build-Depends: libncurses5-dev, libxml2-dev | libxml-dev, libreadline5-dev,
zlib1g-dev (>= 1:1.1.3), libssl-dev (>= 0.9.6f), debmake
Standards-Version: 3.6.1
Package: cadaver
diff -urN ../tmp-orig/cadaver-0.22.2/debian/rules ./debian/rules
--- ../tmp-orig/cadaver-0.22.2/debian/rules 2005-02-08 23:51:17.796836722
+0100
+++ ./debian/rules 2005-02-08 23:04:43.000000000 +0100
@@ -9,7 +9,7 @@
$(checkdir)
-rm config.cache
# this configure will watch DEB_BUILD_OPTIONS for CFLAGS (-g)
- ./configure --prefix=/usr --enable-warnings --with-included-neon
--enable-netrc --without-ssl
+ ./configure --prefix=/usr --with-included-neon --enable-netrc
--without-ssl
$(MAKE)
touch build
diff -urN ../tmp-orig/cadaver-0.22.2/lib/glob.c ./lib/glob.c
--- ../tmp-orig/cadaver-0.22.2/lib/glob.c 2002-01-26 16:48:04.000000000
+0100
+++ ./lib/glob.c 2005-02-08 22:56:35.000000000 +0100
@@ -305,9 +305,6 @@
#include <glob.h>
static
-#if __GNUC__ - 0 >= 2
-inline
-#endif
const char *next_brace_sub __P ((const char *begin));
static int glob_in_dir __P ((const char *pattern, const char *directory,
int flags,
@@ -320,9 +317,6 @@
/* Find the end of the sub-pattern in a brace expression. We define
this as an inline function if the compiler permits. */
static
-#if __GNUC__ - 0 >= 2
-inline
-#endif
const char *
next_brace_sub (begin)
const char *begin;
diff -urN ../tmp-orig/cadaver-0.22.2/libneon/ne_locks.c ./libneon/ne_locks.c
--- ../tmp-orig/cadaver-0.22.2/libneon/ne_locks.c 2004-04-14
16:04:21.000000000 +0200
+++ ./libneon/ne_locks.c 2005-02-08 22:56:35.000000000 +0100
@@ -505,7 +505,7 @@
return end_element_common(lock, state, ctx->cdata->data);
}
-static inline int can_accept(int parent, int id)
+static int can_accept(int parent, int id)
{
return (parent == NE_XML_STATEROOT && id == ELM_prop) ||
(parent == ELM_prop && id == ELM_lockdiscovery) ||
diff -urN ../tmp-orig/cadaver-0.22.2/libneon/ne_request.c ./libneon/ne_request.c
--- ../tmp-orig/cadaver-0.22.2/libneon/ne_request.c 2003-11-13
21:39:23.000000000 +0100
+++ ./libneon/ne_request.c 2005-02-08 22:56:35.000000000 +0100
@@ -176,7 +176,7 @@
/* Returns hash value for header 'name', converting it to lower-case
* in-place. */
-static inline unsigned int hash_and_lower(char *name)
+static unsigned int hash_and_lower(char *name)
{
char *pnt;
unsigned int hash = 0;
@@ -868,7 +868,7 @@
/* remove trailing EOL from 'buf', where strlen(buf) == *len. *len is
* adjusted in accordance with any changes made to the string to
* remain equal to strlen(buf). */
-static inline void strip_eol(char *buf, ssize_t *len)
+static void strip_eol(char *buf, ssize_t *len)
{
char *pnt = &buf[*len-1];
while (pnt >= buf && (*pnt == '\r' || *pnt == '\n')) {
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
