Mon Nov 9 05:26:40 2015 UTC ()
Fix endian detection. hi joerg


(dholland)
diff -r1.10 -r1.11 pkgsrc/graphics/s10sh/distinfo
diff -r1.3 -r1.4 pkgsrc/graphics/s10sh/patches/patch-ac
cvs diff -r1.10 -r1.11 pkgsrc/graphics/s10sh/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/s10sh/distinfo 2015/11/03 21:34:19 1.10
+++ pkgsrc/graphics/s10sh/distinfo 2015/11/09 05:26:40 1.11
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: distinfo,v 1.10 2015/11/03 21:34:19 agc Exp $ 1$NetBSD: distinfo,v 1.11 2015/11/09 05:26:40 dholland Exp $
2 2
3SHA1 (s10sh-0.2.0.tar.gz) = a8ada7c84ff64be98a1195612d48e2042f293eba 3SHA1 (s10sh-0.2.0.tar.gz) = a8ada7c84ff64be98a1195612d48e2042f293eba
4RMD160 (s10sh-0.2.0.tar.gz) = 2b0ef13958bde03b2e9056bc023e3dd0c84747b4 4RMD160 (s10sh-0.2.0.tar.gz) = 2b0ef13958bde03b2e9056bc023e3dd0c84747b4
5SHA512 (s10sh-0.2.0.tar.gz) = bd0c93b2e0c775d20b969344c8438ad86dcf3d21efd83b59e1dab2ce30b28b46e8082a24f8cecb7c4735f78e15fe3d6b2e7f597d61ef8e4c36961b4691ff9355 5SHA512 (s10sh-0.2.0.tar.gz) = bd0c93b2e0c775d20b969344c8438ad86dcf3d21efd83b59e1dab2ce30b28b46e8082a24f8cecb7c4735f78e15fe3d6b2e7f597d61ef8e4c36961b4691ff9355
6Size (s10sh-0.2.0.tar.gz) = 172203 bytes 6Size (s10sh-0.2.0.tar.gz) = 172203 bytes
7SHA1 (patch-aa) = 1708337ee44567e66e227903e0ae15101670ed31 7SHA1 (patch-aa) = 1708337ee44567e66e227903e0ae15101670ed31
8SHA1 (patch-ab) = 83e20d2bbda9de83a3db5a5990f6cc7f1fb1a18c 8SHA1 (patch-ab) = 83e20d2bbda9de83a3db5a5990f6cc7f1fb1a18c
9SHA1 (patch-ac) = eb83c59a8d3c80048e23cc5b631f62dd8ca482ee 9SHA1 (patch-ac) = c4163858852f2d2153f4740989b212102d8436cf
10SHA1 (patch-ad) = 6e4164e2040508253075d5f482a527de9ff33d61 10SHA1 (patch-ad) = 6e4164e2040508253075d5f482a527de9ff33d61
11SHA1 (patch-ae) = f22ee8feef8a8d99c91ecbdfc5dfd7e1751788b9 11SHA1 (patch-ae) = f22ee8feef8a8d99c91ecbdfc5dfd7e1751788b9
12SHA1 (patch-common.c) = ba22cf896aa9826c925c56829485a77d5df453c3 12SHA1 (patch-common.c) = ba22cf896aa9826c925c56829485a77d5df453c3
13SHA1 (patch-main.c) = 668f78b4528a4ad37d3c9780709f97c4688480d0 13SHA1 (patch-main.c) = 668f78b4528a4ad37d3c9780709f97c4688480d0
cvs diff -r1.3 -r1.4 pkgsrc/graphics/s10sh/patches/patch-ac (expand / switch to unified diff)

--- pkgsrc/graphics/s10sh/patches/patch-ac 2015/02/23 18:24:00 1.3
+++ pkgsrc/graphics/s10sh/patches/patch-ac 2015/11/09 05:26:40 1.4
@@ -1,29 +1,34 @@ @@ -1,29 +1,34 @@
1$NetBSD: patch-ac,v 1.3 2015/02/23 18:24:00 joerg Exp $ 1$NetBSD: patch-ac,v 1.4 2015/11/09 05:26:40 dholland Exp $
 2
 3Fix byte order detection.
2 4
3--- bytesex.h.orig 2001-03-13 13:46:18.000000000 +0000 5--- bytesex.h.orig 2001-03-13 13:46:18.000000000 +0000
4+++ bytesex.h 6+++ bytesex.h
5@@ -3,18 +3,15 @@ 7@@ -3,18 +3,18 @@
6 #ifndef S10SH_BYTESEX_H 8 #ifndef S10SH_BYTESEX_H
7 #define S10SH_BYTESEX_H 9 #define S10SH_BYTESEX_H
8  10
9-#if defined(__i386__) \ 11-#if defined(__i386__) \
10- || defined(__alpha__) \ 12- || defined(__alpha__) \
11- || (defined(__mips__) && (defined(MIPSEL) || defined (__MIPSEL__))) 13- || (defined(__mips__) && (defined(MIPSEL) || defined (__MIPSEL__)))
12+#include <sys/endian.h> 14+#include <sys/endian.h>
13+ 15+
14+#if defined(_BYTE_ORDER) && defined(_LITTLE_ENDIAN) && (_BYTE_ORDER == _LITTLE_ENDIAN) 16+#if defined(_BYTE_ORDER) && defined(_LITTLE_ENDIAN) && (_BYTE_ORDER == _LITTLE_ENDIAN)
 17+#define BYTE_ORDER_LITTLE_ENDIAN
 18+#elif defined(_BYTE_ORDER) && defined(_BIG_ENDIAN) && (_BYTE_ORDER == _BIG_ENDIAN)
 19+#define BYTE_ORDER_BIG_ENDIAN
 20+#elif defined(__BYTE_ORDER) && defined(__LITTLE_ENDIAN) && (__BYTE_ORDER == _LITTLE_ENDIAN)
15 #define BYTE_ORDER_LITTLE_ENDIAN 21 #define BYTE_ORDER_LITTLE_ENDIAN
16-#elif defined(__mc68000__) \ 22-#elif defined(__mc68000__) \
17- || defined (__sparc__) \ 23- || defined (__sparc__) \
18- || defined (__sparc) \ 24- || defined (__sparc) \
19- || defined (__PPC__) \ 25- || defined (__PPC__) \
20- || (defined(__mips__) && (defined(MIPSEB) || defined (__MIPSEB__))) 26- || (defined(__mips__) && (defined(MIPSEB) || defined (__MIPSEB__)))
21+#elif defined(__BYTE_ORDER) && defined(__LITTLE_ENDIAN) && (__BYTE_ORDER == _LITTLE_ENDIAN) 
22+#elif defined(__BYTE_ORDER) && defined(__BIG_ENDIAN) && (__BYTE_ORDER == _BIG_ENDIAN) 27+#elif defined(__BYTE_ORDER) && defined(__BIG_ENDIAN) && (__BYTE_ORDER == _BIG_ENDIAN)
23 #define BYTE_ORDER_BIG_ENDIAN 28 #define BYTE_ORDER_BIG_ENDIAN
24 #else 29 #else
25-# error can not find the byte order for this architecture, fix bytesex.h 30-# error can not find the byte order for this architecture, fix bytesex.h
26+#error can not find the byte order for this architecture, fix bytesex.h 31+#error can not find the byte order for this architecture, fix bytesex.h
27 #endif 32 #endif
28  33
29 #endif /* S10SH_BYTESEX_H */ 34 #endif /* S10SH_BYTESEX_H */