diff options
author | hans <hans@pkgsrc.org> | 2011-07-26 14:17:52 +0000 |
---|---|---|
committer | hans <hans@pkgsrc.org> | 2011-07-26 14:17:52 +0000 |
commit | dbb4f5b3855398fdfcc7cffaaf1a48ede2e5e844 (patch) | |
tree | 8a09fad5920eadece996607d00a2a13c1cf822da /devel | |
parent | 893fade611b6bbce2df4beb07a4aaf5cd0922b1a (diff) | |
download | pkgsrc-dbb4f5b3855398fdfcc7cffaaf1a48ede2e5e844.tar.gz |
Fix build on SunOS.
Diffstat (limited to 'devel')
-rw-r--r-- | devel/libvolume_id/distinfo | 8 | ||||
-rw-r--r-- | devel/libvolume_id/patches/patch-aa | 8 | ||||
-rw-r--r-- | devel/libvolume_id/patches/patch-ab | 8 | ||||
-rw-r--r-- | devel/libvolume_id/patches/patch-ad | 24 |
4 files changed, 32 insertions, 16 deletions
diff --git a/devel/libvolume_id/distinfo b/devel/libvolume_id/distinfo index 8251427b0d0..faf978ef6be 100644 --- a/devel/libvolume_id/distinfo +++ b/devel/libvolume_id/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.7 2011/01/18 10:34:38 markd Exp $ +$NetBSD: distinfo,v 1.8 2011/07/26 14:17:52 hans Exp $ SHA1 (libvolume_id-0.81.1.tar.bz2) = 3d2f22654042e5995d119d61d2aecf4b5d8efb8a RMD160 (libvolume_id-0.81.1.tar.bz2) = 222fbe2ff595eeedafe41c9c47987ead34aa455e Size (libvolume_id-0.81.1.tar.bz2) = 23399 bytes -SHA1 (patch-aa) = f1bc3a47df3d98bba4b08e96f957e11f56155c18 -SHA1 (patch-ab) = f9f80eeeb67b8f8babf777bf59226249b03576b8 +SHA1 (patch-aa) = bbd3e04a6de60fd0471dffa605fbbd3d5a4f89b4 +SHA1 (patch-ab) = 2935383630f45199e0a0a63d460fc40fbbeaddbd SHA1 (patch-ac) = d99ce65248e2520f107081b8474225ab1449d72e -SHA1 (patch-ad) = c09ecb39f154c37e72dfb6bb6241ec33d77c0b60 +SHA1 (patch-ad) = 50eb7f2ec99b37d508259870838bfdfc624f53b4 SHA1 (patch-ae) = 9382586dab03ed7691d26b029d930940dc3e7302 diff --git a/devel/libvolume_id/patches/patch-aa b/devel/libvolume_id/patches/patch-aa index 2ebd78d5753..de1caf02563 100644 --- a/devel/libvolume_id/patches/patch-aa +++ b/devel/libvolume_id/patches/patch-aa @@ -1,7 +1,7 @@ -$NetBSD: patch-aa,v 1.3 2009/01/04 23:10:06 dbj Exp $ +$NetBSD: patch-aa,v 1.4 2011/07/26 14:17:53 hans Exp $ ---- ddf_raid.c.orig 2007-12-26 17:05:32.000000000 -0800 -+++ ddf_raid.c 2008-12-28 16:50:36.000000000 -0800 +--- ddf_raid.c.orig 2007-12-27 02:05:32.000000000 +0100 ++++ ddf_raid.c 2011-07-26 16:09:33.749829676 +0200 @@ -22,9 +22,9 @@ #include <string.h> #include <errno.h> @@ -10,7 +10,7 @@ $NetBSD: patch-aa,v 1.3 2009/01/04 23:10:06 dbj Exp $ +#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) #include <sys/endian.h> -#else -+#elif !defined(__APPLE__) ++#elif !defined(__APPLE__) && !defined(__sun) #include <byteswap.h> #endif /* __FreeBSD__ */ diff --git a/devel/libvolume_id/patches/patch-ab b/devel/libvolume_id/patches/patch-ab index 9d566580a0c..1cb7fea7177 100644 --- a/devel/libvolume_id/patches/patch-ab +++ b/devel/libvolume_id/patches/patch-ab @@ -1,7 +1,7 @@ -$NetBSD: patch-ab,v 1.3 2009/01/04 23:10:06 dbj Exp $ +$NetBSD: patch-ab,v 1.4 2011/07/26 14:17:53 hans Exp $ ---- linux_raid.c.orig 2007-12-26 17:03:43.000000000 -0800 -+++ linux_raid.c 2008-12-28 17:45:50.000000000 -0800 +--- linux_raid.c.orig 2007-12-27 02:03:43.000000000 +0100 ++++ linux_raid.c 2011-07-26 16:10:13.635691474 +0200 @@ -22,9 +22,9 @@ #include <string.h> #include <errno.h> @@ -10,7 +10,7 @@ $NetBSD: patch-ab,v 1.3 2009/01/04 23:10:06 dbj Exp $ +#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) #include <sys/endian.h> -#else -+#elif !defined(__APPLE__) ++#elif !defined(__APPLE__) && !defined(__sun) #include <byteswap.h> #endif /* __FreeBSD__ */ diff --git a/devel/libvolume_id/patches/patch-ad b/devel/libvolume_id/patches/patch-ad index 7d641dc87e5..3dac1305845 100644 --- a/devel/libvolume_id/patches/patch-ad +++ b/devel/libvolume_id/patches/patch-ad @@ -1,7 +1,7 @@ -$NetBSD: patch-ad,v 1.3 2009/01/04 23:10:06 dbj Exp $ +$NetBSD: patch-ad,v 1.4 2011/07/26 14:17:53 hans Exp $ ---- util.h.orig 2007-12-26 16:51:05.000000000 -0800 -+++ util.h 2008-12-28 17:47:48.000000000 -0800 +--- util.h.orig 2007-12-27 01:51:05.000000000 +0100 ++++ util.h 2011-07-26 16:07:46.734800140 +0200 @@ -19,7 +19,7 @@ # include <config.h> #endif @@ -11,7 +11,7 @@ $NetBSD: patch-ad,v 1.3 2009/01/04 23:10:06 dbj Exp $ #include <sys/endian.h> #define __BYTE_ORDER _BYTE_ORDER -@@ -29,6 +29,17 @@ +@@ -29,6 +29,33 @@ #define bswap_16 bswap16 #define bswap_32 bswap32 #define bswap_64 bswap64 @@ -26,6 +26,22 @@ $NetBSD: patch-ad,v 1.3 2009/01/04 23:10:06 dbj Exp $ +#define bswap_16 OSSwapInt16 +#define bswap_32 OSSwapInt32 +#define bswap_64 OSSwapInt64 ++#elif defined(__sun) ++#include <sys/isa_defs.h> ++#include <sys/byteorder.h> ++ ++#define __LITTLE_ENDIAN 1234 ++#define __BIG_ENDIAN 4321 ++#if defined(_BIG_ENDIAN) ++#define __BYTE_ORDER __BIG_ENDIAN ++#elif defined(_LITTLE_ENDIAN) ++#define __BYTE_ORDER __LITTLE_ENDIAN ++#endif ++ ++#define bswap_16 BSWAP_16 ++#define bswap_32 BSWAP_32 ++#define bswap_64 BSWAP_64 ++ #else #include <endian.h> #include <byteswap.h> |