Your message dated Fri, 09 Mar 2007 23:17:02 +0000
with message-id <[EMAIL PROTECTED]>
and subject line Bug#413868: fixed in brandy 1.20~pre3-2
has caused the attached Bug report to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what I am
talking about this indicates a serious mail system misconfiguration
somewhere. Please contact me immediately.)
Debian bug tracking system administrator
(administrator, Debian Bugs database)
--- Begin Message ---
Package: brandy
Severity: important
Tags: patch
Hi,
currently your package FTBFS on GNU/kFreeBSD, with the following error:
> gcc -Wall -O2 -g -I/usr/include/SDL src/variables.c -c -o
> src/variables.o
> In file included from src/variables.c:31:
> src/target.h:111:2: error: #error Target operating system for
> interpreter is either missing or not supported
> make[1]: *** [src/variables.o] Error 1
> make[1]: Leaving directory `/build/buildd/brandy-1.20~pre3'
> make: *** [build-stamp] Error 2
Full build logs are available at
<http://experimental.ftbfs.de/build.php?arch=kfreebsd-i386&pkg=brandy>.
Please find attached a patch to add support for GNU/kFreeBSD. Basically,
it uses exactly the same code/defines as other free platforms (e.g.
Linux, NetBSD, FreeBSD, etc.), but isn't really like Linux since there's
an undefined XCASE, so a proper TARGET_* is needed.
Cheers,
--
Cyril Brulebois
--- brandy-1.20~pre3/src/emulate.c 2007-03-07 18:31:47.681738000 +0100
+++ brandy-1.20~pre3/src/emulate.c 2007-03-07 18:32:07.000000000 +0100
@@ -937,7 +937,7 @@
#elif defined(TARGET_NETBSD) | defined(TARGET_LINUX) | defined(TARGET_MACOSX)\
| defined(TARGET_UNIX) | defined(TARGET_FREEBSD) | defined(TARGET_OPENBSD)\
- | defined(TARGET_AMIGA)
+ | defined(TARGET_AMIGA) | defined(TARGET_GNUKFREEBSD)
/*
** emulate_oscli issued the operating system command 'command'.
** 'respfile' is set to NIL if the command output is to displayed
--- brandy-1.20~pre3/src/errors.c 2007-03-07 18:31:47.756616000 +0100
+++ brandy-1.20~pre3/src/errors.c 2007-03-07 18:32:44.000000000 +0100
@@ -103,7 +103,7 @@
(void) signal(SIGSEGV, handle_signal);
error(ERR_ADDRESS);
#if defined(TARGET_LINUX) | defined(TARGET_NETBSD) | defined(TARGET_MACOSX)\
- | defined(TARGET_FREEBSD) |defined(TARGET_OPENBSD)
+ | defined(TARGET_FREEBSD) |defined(TARGET_OPENBSD) | defined(TARGET_GNUKFREEBSD)
case SIGCONT:
(void) signal(SIGCONT, handle_signal);
init_keyboard();
@@ -126,7 +126,7 @@
(void) signal(SIGSEGV, handle_signal);
(void) signal(SIGINT, handle_signal);
#if defined(TARGET_LINUX) | defined(TARGET_NETBSD) | defined(TARGET_MACOSX)\
- | defined(TARGET_FREEBSD) |defined(TARGET_OPENBSD)
+ | defined(TARGET_FREEBSD) |defined(TARGET_OPENBSD) | defined(TARGET_GNUKFREEBSD)
(void) signal(SIGCONT, handle_signal);
#endif
#ifdef TARGET_DJGPP
@@ -146,7 +146,7 @@
(void) signal(SIGSEGV, SIG_DFL);
(void) signal(SIGINT, SIG_DFL);
#if defined(TARGET_LINUX) | defined(TARGET_NETBSD) | defined(TARGET_MACOSX)\
- | defined(TARGET_FREEBSD) |defined(TARGET_OPENBSD)
+ | defined(TARGET_FREEBSD) |defined(TARGET_OPENBSD) | defined(TARGET_GNUKFREEBSD)
(void) signal(SIGCONT, SIG_DFL);
#endif
#ifdef TARGET_DJGPP
--- brandy-1.20~pre3/src/keyboard.c 2007-03-07 18:17:18.937376000 +0100
+++ brandy-1.20~pre3/src/keyboard.c 2007-03-07 18:33:15.000000000 +0100
@@ -160,7 +160,8 @@
#if defined(TARGET_LINUX) | defined(TARGET_NETBSD) | defined(TARGET_MACOSX)\
| defined(TARGET_DJGPP) | defined(TARGET_FREEBSD) | defined(TARGET_OPENBSD)\
- | defined(TARGET_AMIGA) & defined(__GNUC__)
+ | defined(TARGET_AMIGA) & defined(__GNUC__)\
+ | defined(TARGET_GNUKFREEBSD)
#include <sys/time.h>
#include <sys/types.h>
#include <errno.h>
@@ -282,6 +283,8 @@
#define OSVERSION 0xF6
#elif defined(TARGET_AMIGA)
#define OSVERSION 0xF5
+#elif defined(TARGET_GNUKFREEBSD)
+#define OSVERSION 0xF4
#else
#error Target operating system is either not defined or not supported
#endif
@@ -328,7 +331,8 @@
static int fn_string_count; /* Count of characters left in function key string */
#if defined(TARGET_LINUX) | defined(TARGET_NETBSD) | defined(TARGET_MACOSX)\
- | defined(TARGET_FREEBSD) |defined(TARGET_OPENBSD) | defined(TARGET_AMIGA) & defined(__GNUC__)
+ | defined(TARGET_FREEBSD) |defined(TARGET_OPENBSD) | defined(TARGET_AMIGA) & defined(__GNUC__)\
+ | defined(TARGET_GNUKFREEBSD)
static struct termios origtty; /* Copy of original keyboard parameters */
static int32 keyboard; /* File descriptor for keyboard */
@@ -404,7 +408,8 @@
}
#if defined(TARGET_LINUX) | defined(TARGET_NETBSD) | defined(TARGET_MACOSX)\
- | defined(TARGET_FREEBSD) | defined(TARGET_OPENBSD) | defined(TARGET_AMIGA) & defined(__GNUC__)
+ | defined(TARGET_FREEBSD) | defined(TARGET_OPENBSD) | defined(TARGET_AMIGA) & defined(__GNUC__)\
+ | defined(TARGET_GNUKFREEBSD)
/* ----- Linux-, *BSD- and MACOS-specific keyboard input functions ----- */
@@ -1457,7 +1462,8 @@
}
#elif defined(TARGET_LINUX) | defined(TARGET_NETBSD) | defined(TARGET_MACOSX)\
- | defined(TARGET_FREEBSD) | defined(TARGET_OPENBSD) | defined(TARGET_AMIGA) & defined(__GNUC__)
+ | defined(TARGET_FREEBSD) | defined(TARGET_OPENBSD) | defined(TARGET_AMIGA) & defined(__GNUC__)\
+ | defined(TARGET_GNUKFREEBSD)
/*
** 'init_keyboard' initialises the keyboard code. It checks to
--- brandy-1.20~pre3/src/target.h 2007-03-07 18:15:15.414357000 +0100
+++ brandy-1.20~pre3/src/target.h 2007-03-07 18:36:12.000000000 +0100
@@ -81,6 +81,14 @@
#define BRANDY_OS "Linux"
#endif
+/* Same as Linux, but can be treated exactly like it, see the Linux specific
+ * XCASE in src/keyboard.c */
+#if (defined __FreeBSD_kernel__)
+#define TARGET_GNUKFREEBSD
+#define USE_SDL
+#define BRANDY_OS "GNU/kFreeBSD"
+#endif
+
#ifdef DJGPP
#define TARGET_DJGPP
#define BRANDY_OS "DJGPP"
@@ -155,7 +163,7 @@
#define EDITOR_VARIABLE "EDITOR"
#define DEFAULT_EDITOR "edit"
#elif defined(TARGET_LINUX) | defined(TARGET_NETBSD) | defined(TARGET_FREEBSD)\
- | defined(TARGET_OPENBSD)
+ | defined(TARGET_OPENBSD) | defined(TARGET_GNUKFREEBSD)
#define EDITOR_VARIABLE "EDITOR"
#define DEFAULT_EDITOR "vi"
#elif defined(TARGET_MACOSX)
@@ -181,7 +189,7 @@
#define DIR_SEPS "\\/:"
#define DIR_SEP '\\'
#elif defined(TARGET_LINUX) | defined(TARGET_NETBSD) | defined(TARGET_MACOSX)\
- | defined(TARGET_FREEBSD) | defined(TARGET_OPENBSD)
+ | defined(TARGET_FREEBSD) | defined(TARGET_OPENBSD) | defined(TARGET_GNUKFREEBSD)
#define DIR_SEPS "/"
#define DIR_SEP '/'
#elif defined(TARGET_RISCOS)
@@ -197,7 +205,8 @@
#if defined(__arm)
#define MACTYPE 0x600
#elif defined(TARGET_LINUX) | defined(TARGET_NETBSD) | defined(TARGET_MACOSX)\
- | defined(TARGET_FREEBSD) | defined(TARGET_OPENBSD) | defined(TARGET_AMIGA)
+ | defined(TARGET_FREEBSD) | defined(TARGET_OPENBSD) | defined(TARGET_AMIGA)\
+ | defined(TARGET_GNUKFREEBSD)
#define MACTYPE 0x800
#elif defined(TARGET_DJGPP) | defined(TARGET_WIN32) | defined(TARGET_BCC32)
#define MACTYPE 0x2000
--- brandy-1.20~pre3/src/textonly.c 2007-03-07 18:31:47.840533000 +0100
+++ brandy-1.20~pre3/src/textonly.c 2007-03-07 18:33:58.000000000 +0100
@@ -47,7 +47,7 @@
#endif
#if defined(TARGET_LINUX) | defined(TARGET_NETBSD) | defined(TARGET_DJGPP)\
- | defined(TARGET_FREEBSD) | defined(TARGET_OPENBSD)
+ | defined(TARGET_FREEBSD) | defined(TARGET_OPENBSD) | defined(TARGET_GNUKFREEBSD)
#include <sys/ioctl.h>
#include <sys/types.h>
#include <unistd.h>
@@ -1570,7 +1570,7 @@
*/
static void find_screensize(void) {
#if defined(TARGET_LINUX) | defined(TARGET_NETBSD) | defined(TARGET_FREEBSD)\
- | defined(TARGET_OPENBSD)
+ | defined(TARGET_OPENBSD) | defined(TARGET_GNUKFREEBSD)
struct winsize sizes;
int rc;
if (!basicvars.runflags.outredir)
--- End Message ---
--- Begin Message ---
Source: brandy
Source-Version: 1.20~pre3-2
We believe that the bug you reported is fixed in the latest version of
brandy, which is due to be installed in the Debian FTP archive:
brandy_1.20~pre3-2.diff.gz
to pool/main/b/brandy/brandy_1.20~pre3-2.diff.gz
brandy_1.20~pre3-2.dsc
to pool/main/b/brandy/brandy_1.20~pre3-2.dsc
brandy_1.20~pre3-2_i386.deb
to pool/main/b/brandy/brandy_1.20~pre3-2_i386.deb
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to [EMAIL PROTECTED],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Colin Tuckley <[EMAIL PROTECTED]> (supplier of updated brandy package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [EMAIL PROTECTED])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Format: 1.7
Date: Fri, 9 Mar 2007 14:12:30 +0000
Source: brandy
Binary: brandy
Architecture: source i386
Version: 1.20~pre3-2
Distribution: unstable
Urgency: low
Maintainer: Colin Tuckley <[EMAIL PROTECTED]>
Changed-By: Colin Tuckley <[EMAIL PROTECTED]>
Description:
brandy - BBC BASIC V interpreter
Closes: 413868
Changes:
brandy (1.20~pre3-2) unstable; urgency=low
.
* Fix problem with INKEY when wait time was zero in keyboard.c
* Fix FTBFS on GNU/kFreeBSD patch by Cyril Brulebois Closes: #413868
Files:
57b669ea4c46ba8464db129cd8089f2c 580 interpreters optional
brandy_1.20~pre3-2.dsc
58a7fb0d3d00efa7659bdd336d9cd9e0 6001 interpreters optional
brandy_1.20~pre3-2.diff.gz
763eef73f6ea1cbafab61ad89095542c 226236 interpreters optional
brandy_1.20~pre3-2_i386.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.3 (GNU/Linux)
iD8DBQFF8efZipBneRiAKDwRAraVAJ9+Kb+/Cu95L0ZczMht6c3/xhorCwCfZw/2
Geybx9ge9qxAzIPw2RfU8SY=
=l6zR
-----END PGP SIGNATURE-----
--- End Message ---
