diff options
| author | hans <hans@pkgsrc.org> | 2012-03-07 15:08:40 +0000 |
|---|---|---|
| committer | hans <hans@pkgsrc.org> | 2012-03-07 15:08:40 +0000 |
| commit | 665d89b704fadd3ae22b144e9337f9b23dbcb12e (patch) | |
| tree | 0525c51fab9f3bcdf70e6d88edd6bf733b476943 /emulators/swarm | |
| parent | 8d1a7892c8d25f36b410ed4dbf9da879bb581433 (diff) | |
| download | pkgsrc-665d89b704fadd3ae22b144e9337f9b23dbcb12e.tar.gz | |
Fix build on SunOS.
Use correct header for endianness definitions and add a getpt() function.
Diffstat (limited to 'emulators/swarm')
| -rw-r--r-- | emulators/swarm/distinfo | 6 | ||||
| -rw-r--r-- | emulators/swarm/patches/patch-aa | 23 | ||||
| -rw-r--r-- | emulators/swarm/patches/patch-ad | 18 |
3 files changed, 35 insertions, 12 deletions
diff --git a/emulators/swarm/distinfo b/emulators/swarm/distinfo index f8afc40ab1d..de2f28a0a18 100644 --- a/emulators/swarm/distinfo +++ b/emulators/swarm/distinfo @@ -1,12 +1,12 @@ -$NetBSD: distinfo,v 1.9 2005/12/09 12:10:09 joerg Exp $ +$NetBSD: distinfo,v 1.10 2012/03/07 15:08:40 hans Exp $ SHA1 (swarm-0.61.tar.gz) = 36ed52671f8be2cf8e799efd94a48b2919979d2c RMD160 (swarm-0.61.tar.gz) = d8e15da178236a46761a65cd52809276df5f3511 Size (swarm-0.61.tar.gz) = 395061 bytes -SHA1 (patch-aa) = 65da2134c0d99930412e60fbb3e0f299d3982113 +SHA1 (patch-aa) = 58aaf4fc9a39f14a8083ef8cc534b0199a757360 SHA1 (patch-ab) = 5a71a670297e4d8db2dd3c7c96d9528f878d13cb SHA1 (patch-ac) = 20b0603e24178a6086531bd2f7eb0eb5fc0e99c3 -SHA1 (patch-ad) = 4e660fcb3dae67d4519ad3df40e342707e983e96 +SHA1 (patch-ad) = 6d328a265f9e2f7774e759d01a920a81e1bceeb8 SHA1 (patch-ae) = 08b8819ad53bb0a91c3ab7a56479b2f36faab754 SHA1 (patch-af) = 8228c591fd22ee8984d1f434940ad2cbbba41a22 SHA1 (patch-ag) = 4d3ca9cd45edc081b85019ec88135504b3e7b0a1 diff --git a/emulators/swarm/patches/patch-aa b/emulators/swarm/patches/patch-aa index 3eea0de9b7e..8736a1a41b4 100644 --- a/emulators/swarm/patches/patch-aa +++ b/emulators/swarm/patches/patch-aa @@ -1,24 +1,35 @@ -$NetBSD: patch-aa,v 1.5 2005/11/03 21:51:57 rillig Exp $ +$NetBSD: patch-aa,v 1.6 2012/03/07 15:08:40 hans Exp $ fix tests for endianness and use our own header files to get int64_t and uint64_t --- src/swarm_types.h.orig Tue Apr 10 09:46:10 2001 +++ src/swarm_types.h -@@ -26,9 +26,10 @@ +@@ -26,11 +26,21 @@ #ifndef __SWARM_TYPES_H__ #define __SWARM_TYPES_H__ -#ifdef sun4 -+#include <sys/endian.h> -+#if BYTE_ORDER == BIG_ENDIAN ++#ifdef __sun ++#include <sys/byteorder.h> ++#ifdef _BIG_ENDIAN #define __BIG_ENDIAN__ -#else /* ix86 / alpha / arm32 */ +#else ++#define __LITTLE_ENDIAN__ ++#endif ++#else ++#include <sys/endian.h> ++#if BYTE_ORDER == BIG_ENDIAN ++#define __BIG_ENDIAN__ ++#else #define __LITTLE_ENDIAN__ #endif ++#endif -@@ -60,6 +61,10 @@ + #ifdef WIN32 + #include <windows.h> +@@ -60,6 +70,10 @@ typedef int int32_ typedef unsigned short uint16_t; typedef unsigned int uint32_t; @@ -29,7 +40,7 @@ int64_t and uint64_t #ifndef WIN32 #ifndef __int8_t_defined typedef long long int int64_t; -@@ -69,6 +74,7 @@ +@@ -69,6 +83,7 @@ typedef unsigned long long int uint64 typedef INT64 int64_t; typedef UINT64 uint64_t; #endif // !WIN32 diff --git a/emulators/swarm/patches/patch-ad b/emulators/swarm/patches/patch-ad index 88aaaf2559b..91cc6393692 100644 --- a/emulators/swarm/patches/patch-ad +++ b/emulators/swarm/patches/patch-ad @@ -1,8 +1,20 @@ -$NetBSD: patch-ad,v 1.3 2005/12/09 12:10:09 joerg Exp $ +$NetBSD: patch-ad,v 1.4 2012/03/07 15:08:40 hans Exp $ --- src/uartctrl.cpp 2003/08/14 08:54:51 1.1 +++ src/uartctrl.cpp 2003/08/14 09:15:14 -@@ -40,6 +40,29 @@ +@@ -35,11 +35,41 @@ + + #define MODULE_NAME "UARTCTRL" + ++#ifdef __sun ++static int getpt(void) ++{ ++ return open("/dev/ptmx", O_RDWR|O_NOCTTY); ++} ++#endif ++ + /////////////////////////////////////////////////////////////////////////////// + // ~CUARTCtrl - // int CUARTCtrl::GetPty() { @@ -32,7 +44,7 @@ $NetBSD: patch-ad,v 1.3 2005/12/09 12:10:09 joerg Exp $ char *namepty; struct termios tiopty; int curFlags; -@@ -102,6 +125,7 @@ +@@ -102,6 +132,7 @@ int CUARTCtrl::GetPty() getchar(); } return 0; |