diff options
author | bsiegert <bsiegert@pkgsrc.org> | 2017-11-12 11:39:47 +0000 |
---|---|---|
committer | bsiegert <bsiegert@pkgsrc.org> | 2017-11-12 11:39:47 +0000 |
commit | c6cb1d15645b28ef04f95f750ea700cf12543b8b (patch) | |
tree | 765775d64f8ea56cbf39bafb7d14a9c3115ecf01 | |
parent | f61181c55b0b4a92dab6eebda305d0ef8d806170 (diff) | |
download | pkgsrc-c6cb1d15645b28ef04f95f750ea700cf12543b8b.tar.gz |
Pullup ticket #5630 - requested by sevan
devel/idutils: FreeBSD build fix
Revisions pulled up:
- devel/idutils/distinfo 1.10
- devel/idutils/patches/patch-lib_fflush_c 1.2
- devel/idutils/patches/patch-lib_fseeko_c 1.2
---
Module Name: pkgsrc
Committed By: agc
Date: Thu Nov 2 04:26:21 UTC 2017
Modified Files:
pkgsrc/devel/idutils/patches: patch-lib_fflush_c patch-lib_fseeko_c
Log Message:
patch fflush.c and fseeko.c so that this package builds on FreeBSD HEAD
---
Module Name: pkgsrc
Committed By: maya
Date: Thu Nov 2 04:54:27 UTC 2017
Modified Files:
pkgsrc/devel/idutils: distinfo
Log Message:
idutils: regen patch sums after previous commit
-rw-r--r-- | devel/idutils/distinfo | 6 | ||||
-rw-r--r-- | devel/idutils/patches/patch-lib_fflush_c | 13 | ||||
-rw-r--r-- | devel/idutils/patches/patch-lib_fseeko_c | 13 |
3 files changed, 25 insertions, 7 deletions
diff --git a/devel/idutils/distinfo b/devel/idutils/distinfo index 055044c50af..dab52c30f86 100644 --- a/devel/idutils/distinfo +++ b/devel/idutils/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.9 2015/11/03 03:27:35 agc Exp $ +$NetBSD: distinfo,v 1.9.18.1 2017/11/12 11:39:47 bsiegert Exp $ SHA1 (idutils-4.6.tar.xz) = cb977ce3e4b2bacda85797e9048986e1c1765148 RMD160 (idutils-4.6.tar.xz) = 9b136e5bedf04183a631c1c7642c7982deb5016d @@ -14,5 +14,5 @@ SHA1 (patch-aj) = 8381724be238e518a86377b3226cf05e99b83f1d SHA1 (patch-ak) = c2b3573a5386e77fc6bc1d5a4e89ccd1af830630 SHA1 (patch-al) = 163e06074da62edbcacd459788cfea3528e94e30 SHA1 (patch-configure) = 06e53f65b7515276f054049c502b3187ba7a156f -SHA1 (patch-lib_fflush_c) = 41e1dcfc0982148d1a2c7cceb6aa117c1ded774a -SHA1 (patch-lib_fseeko_c) = 35ac50c58f8d6339d37ff72a0e2b58f0233a7cc0 +SHA1 (patch-lib_fflush_c) = 61e35e848c54a5d1a51b37f57619aae6d641f04a +SHA1 (patch-lib_fseeko_c) = db25ba77b9c4e471e446cf917046cdf0f96b630f diff --git a/devel/idutils/patches/patch-lib_fflush_c b/devel/idutils/patches/patch-lib_fflush_c index 00f3499ca56..3e9f213c245 100644 --- a/devel/idutils/patches/patch-lib_fflush_c +++ b/devel/idutils/patches/patch-lib_fflush_c @@ -1,4 +1,4 @@ -$NetBSD: patch-lib_fflush_c,v 1.1 2014/12/15 11:35:42 mef Exp $ +$NetBSD: patch-lib_fflush_c,v 1.1.26.1 2017/11/12 11:39:47 bsiegert Exp $ fflush.c:108:16: error: incompatible types when assigning to type '__off_t' from type 'fpos_t' fp_->_offset = u.f; @@ -6,7 +6,16 @@ fflush.c:108:16: error: incompatible types when assigning to type '__off_t' from --- lib/fflush.c.orig 2012-01-29 01:22:33.000000000 +0900 +++ lib/fflush.c 2014-11-20 23:50:41.000000000 +0900 -@@ -105,7 +105,7 @@ update_fpos_cache (FILE *fp, off_t pos) +@@ -91,7 +91,7 @@ + update_fpos_cache (FILE *fp, off_t pos) + { + #if defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, MacOS X, Cygwin */ +-# if defined __CYGWIN__ ++# if defined(__CYGWIN__) || defined(__FreeBSD__) + /* fp_->_offset is typed as an integer. */ + fp_->_offset = pos; + # else +@@ -105,7 +105,7 @@ off_t o; } u; u.o = pos; diff --git a/devel/idutils/patches/patch-lib_fseeko_c b/devel/idutils/patches/patch-lib_fseeko_c index f2b0cf7fd37..48ee6d1acce 100644 --- a/devel/idutils/patches/patch-lib_fseeko_c +++ b/devel/idutils/patches/patch-lib_fseeko_c @@ -1,4 +1,4 @@ -$NetBSD: patch-lib_fseeko_c,v 1.1 2014/12/15 11:35:42 mef Exp $ +$NetBSD: patch-lib_fseeko_c,v 1.1.26.1 2017/11/12 11:39:47 bsiegert Exp $ fseeko.c:127:22: error: incompatible types when assigning to type '__off_t' from type 'fpos_t' fp_->_offset = u.f; @@ -6,7 +6,16 @@ fseeko.c:127:22: error: incompatible types when assigning to type '__off_t' from --- lib/fseeko.c~ 2012-01-29 01:26:04.000000000 +0900 +++ lib/fseeko.c 2014-11-20 23:51:55.000000000 +0900 -@@ -124,7 +124,7 @@ fseeko (FILE *fp, off_t offset, int when +@@ -109,7 +109,7 @@ + fp->_flags &= ~_IO_EOF_SEEN; + fp->_offset = pos; + #elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, MacOS X, Cygwin */ +-# if defined __CYGWIN__ ++# if defined(__CYGWIN__) || defined(__FreeBSD__) + /* fp_->_offset is typed as an integer. */ + fp_->_offset = pos; + # else +@@ -124,7 +124,7 @@ off_t o; } u; u.o = pos; |