Package: mush
Severity: normal
Tags: patch
When building 'mush' on amd64 with gcc-4.0,
I get the following error:
make[1]: Entering directory `/mush-7.2.5unoff2'
gcc -fwritable-strings -O2 -DSYSV -DUSG -DCURSES -DNO_COMMAS -DDEBIAN -c -o
commands.o commands.c
cc1: error: unrecognized command line option "-fwritable-strings"
make[1]: *** [commands.o] Error 1
make[1]: Leaving directory `/mush-7.2.5unoff2'
make: *** [build-stamp] Error 2
With the attached patch 'mush' can be compiled
on amd64 using gcc-4.0.
The patch includes a patch which was already necessary for gcc-3.4.
The patch also changes the Build-Depends to 'libreadline5-dev' in
debian/control.
Regards
Andreas Jochens
diff -urN ../tmp-orig/mush-7.2.5unoff2/debian/control ./debian/control
--- ../tmp-orig/mush-7.2.5unoff2/debian/control 2005-02-09 08:16:25.532983951
+0100
+++ ./debian/control 2005-02-08 23:01:35.000000000 +0100
@@ -2,7 +2,7 @@
Section: non-free/mail
Priority: optional
Maintainer: Pawel Wiecek <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 4.1.16), libncurses5-dev, libreadline4-dev
+Build-Depends: debhelper (>= 4.1.16), libncurses5-dev, libreadline5-dev
Standards-Version: 3.6.1
Package: mush
diff -urN ../tmp-orig/mush-7.2.5unoff2/loop.c ./loop.c
--- ../tmp-orig/mush-7.2.5unoff2/loop.c 2005-02-09 08:16:25.521986087 +0100
+++ ./loop.c 2005-02-08 23:01:24.000000000 +0100
@@ -22,7 +22,6 @@
#define isdelimeter(c) (index(" \t;|", c))
char *alias_expand(), *hist_expand(), *reference_hist(), *hist_from_str();
-char *calloc();
struct history {
int histno;
diff -urN ../tmp-orig/mush-7.2.5unoff2/makefile.linux ./makefile.linux
--- ../tmp-orig/mush-7.2.5unoff2/makefile.linux 2005-02-09 08:16:25.538982786
+0100
+++ ./makefile.linux 2005-02-08 23:02:02.000000000 +0100
@@ -39,11 +39,11 @@
OPT_CFLAGS = -O6 -fomit-frame-pointer
#OPT_CFLAGS = -g
SYS_CFLAGS = -DSYSV -DUSG
-CFLAGS= -fwritable-strings $(OPT_CFLAGS) $(SYS_CFLAGS) -DCURSES -DNO_COMMAS \
+CFLAGS= $(OPT_CFLAGS) $(SYS_CFLAGS) -DCURSES -DNO_COMMAS \
$(OTHER_CFLAGS)
# NO_COMMAS included because it's needed by Qmail (which is used by damn many
# people including myself) and shouldn't hurt anyone anyway
-#CFLAGS= -I /usr/include/ncurses -fwritable-strings -g -m486 -DSYSV -DUSG
-DCURSES -DSIGRET=void -DENV_MAIL
+#CFLAGS= -I /usr/include/ncurses -g -m486 -DSYSV -DUSG -DCURSES -DSIGRET=void
-DENV_MAIL
LDFLAGS=
#LDFLAGS=-g
LIBS= -lncurses #-lPW
diff -urN ../tmp-orig/mush-7.2.5unoff2/mush.h ./mush.h
--- ../tmp-orig/mush-7.2.5unoff2/mush.h 2005-02-09 08:16:25.526985116 +0100
+++ ./mush.h 2005-02-08 23:01:24.000000000 +0100
@@ -65,11 +65,6 @@
#include <setjmp.h>
#include "strings.h"
-extern char
- *malloc(), /* allocate memory */
- *calloc(), /* allocate and clear memory */
- *realloc(); /* re-allocate memory */
-
extern void
free_vec(), /* free a malloc'ed argv */
xfree(); /* free malloc'ed pointers */
diff -urN ../tmp-orig/mush-7.2.5unoff2/pop.c ./pop.c
--- ../tmp-orig/mush-7.2.5unoff2/pop.c 2005-02-09 08:16:25.531984146 +0100
+++ ./pop.c 2005-02-08 23:01:24.000000000 +0100
@@ -46,11 +46,6 @@
#include <string.h>
#include <strings.h>
-#if 0
-extern char *
-strstr( /* char *, char * */ );
-#endif
-
#include <netdb.h>
#include <errno.h>
#include <stdio.h>
@@ -60,32 +55,6 @@
#define strerror(eno) sys_errlist[eno]
#endif
-extern char *
-getenv( /* char * */ );
-extern char *
-getlogin( /* void */ );
-extern char *
-getpass( /* char * */ );
-extern int
-getuid( /* void */ );
-extern void
-bzero( /* char *, int */ ), bcopy( /* char *, char *, int */ );
-extern int
-socket( /* int, int, int */ );
-extern int
-connect( /* int, struct sockaddr *, int */ );
-extern int
-close( /* int */ );
-extern int
-read( /* int, char *, int */ ), write( /* int, char *, int */ );
-extern int
-atoi( /* char * */ );
-
-#if !(defined(vax) && defined(__GNUC__))
-extern int
-fprintf( /* FILE *, char *, ... */ );
-#endif /* !(vax && __GNUC__) */
-
#ifdef KERBEROS
extern int
krb_sendauth( /* long, int, KTEXT, char *, char *, char *, u_long, MSG_DAT **,
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
