diff options
| author | sevan <sevan@pkgsrc.org> | 2015-03-05 21:29:20 +0000 |
|---|---|---|
| committer | sevan <sevan@pkgsrc.org> | 2015-03-05 21:29:20 +0000 |
| commit | e759b96b33cfbd3147744d1f9e2b905da7878dd1 (patch) | |
| tree | 129b4143b5a3eb184fc1f0175901d58dfa153637 /sysutils | |
| parent | 8b59d1aee5097d83f100ea5d66ebd2a0cb0a5905 (diff) | |
| download | pkgsrc-e759b96b33cfbd3147744d1f9e2b905da7878dd1.tar.gz | |
Add a new header check for sys/mman.h & use it in src/util.h
Resolves build issue on FreeBSD as off_t is defined in sys/mman.h
Reviewed by: wiz@
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/diskscrub/distinfo | 5 | ||||
| -rw-r--r-- | sysutils/diskscrub/patches/patch-configure.ac | 9 | ||||
| -rw-r--r-- | sysutils/diskscrub/patches/patch-src_util.h | 15 |
3 files changed, 23 insertions, 6 deletions
diff --git a/sysutils/diskscrub/distinfo b/sysutils/diskscrub/distinfo index f3353973ad0..bcaec0ec56e 100644 --- a/sysutils/diskscrub/distinfo +++ b/sysutils/diskscrub/distinfo @@ -1,10 +1,11 @@ -$NetBSD: distinfo,v 1.4 2014/02/21 01:13:00 prlw1 Exp $ +$NetBSD: distinfo,v 1.5 2015/03/05 21:29:20 sevan Exp $ SHA1 (scrub-2.5.2.tar.bz2) = 863e5894e6acb3f922cb25f58e260f9c59b55c14 RMD160 (scrub-2.5.2.tar.bz2) = 852698810f401226608f6b1882191dc7bd2b47e4 Size (scrub-2.5.2.tar.bz2) = 161468 bytes -SHA1 (patch-configure.ac) = 929828e5c8ad340bfc4d6141aad45697d20fef20 +SHA1 (patch-configure.ac) = 9dcbaa212b2778331368b47eb54dd363a843b145 SHA1 (patch-src_Makefile.am) = 4bdd6a41a6fcdc72120d5a1ebd8a17f9d90881d6 SHA1 (patch-src_genrand.c) = 1440cce8bce8b7c9eba4fde44284f6a9f6277a41 SHA1 (patch-src_getsize.c) = 221d201423b38a38486e4c91f4b9e28f6a1d0b52 +SHA1 (patch-src_util.h) = 63dd2f23385f5355dc38b2e7738f8c3249f22738 SHA1 (patch-test_Makefile.am) = ada26d5b518eb630ac7e6ba0d6a61ae5e3280157 diff --git a/sysutils/diskscrub/patches/patch-configure.ac b/sysutils/diskscrub/patches/patch-configure.ac index 551fe0e3a38..800566d0ed0 100644 --- a/sysutils/diskscrub/patches/patch-configure.ac +++ b/sysutils/diskscrub/patches/patch-configure.ac @@ -1,13 +1,13 @@ -$NetBSD: patch-configure.ac,v 1.1 2013/12/11 19:07:47 prlw1 Exp $ +$NetBSD: patch-configure.ac,v 1.2 2015/03/05 21:29:20 sevan Exp $ - Make unimplemented getsize() function match prototype in getsize.h. - Use ioctl names (feature tests) rather than OS names. XXX for SIOC_CAPACITY consider using SIOC_STORAGE_CAPACITY. - Implement getsize() based on DIOCGDISKINFO ioctl. ---- configure.ac.orig 2013-12-11 17:23:58.000000000 +0000 +--- configure.ac.orig 2012-06-20 22:00:27.000000000 +0000 +++ configure.ac -@@ -43,7 +43,14 @@ AC_HEADER_STDC +@@ -43,7 +43,15 @@ AC_HEADER_STDC AC_CHECK_HEADERS( \ getopt.h \ stdbool.h \ @@ -19,10 +19,11 @@ $NetBSD: patch-configure.ac,v 1.1 2013/12/11 19:07:47 prlw1 Exp $ + sys/dkio.h \ + sys/ioctl.h \ + sys/scsi.h \ ++ sys/mman.h \ ) AC_PROG_LIBTOOL -@@ -56,6 +63,12 @@ AC_C_BIGENDIAN +@@ -56,6 +64,12 @@ AC_C_BIGENDIAN AC_C_CONST ## diff --git a/sysutils/diskscrub/patches/patch-src_util.h b/sysutils/diskscrub/patches/patch-src_util.h new file mode 100644 index 00000000000..f583251bd97 --- /dev/null +++ b/sysutils/diskscrub/patches/patch-src_util.h @@ -0,0 +1,15 @@ +$NetBSD: patch-src_util.h,v 1.1 2015/03/05 21:29:20 sevan Exp $ + +--- src/util.h.orig 2015-03-05 19:13:14.116234563 +0000 ++++ src/util.h +@@ -30,6 +30,10 @@ + typedef enum { false, true } bool; + #endif + ++#ifdef HAVE_SYS_MMAN_H ++#include <sys/mman.h> ++#endif ++ + typedef enum { + FILE_NOEXIST, + FILE_REGULAR, |