pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/textproc/sift Fix build with Go 1.10, bump revision.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/a9f986c6e9e6
branches:  trunk
changeset: 377164:a9f986c6e9e6
user:      bsiegert <bsiegert%pkgsrc.org@localhost>
date:      Tue Mar 13 17:28:59 2018 +0000

description:
Fix build with Go 1.10, bump revision.

There is a cgo file in here that specifies -funroll-loops (fun!). Since
Go 1.9.4, only C compiler flags on a whitelist are allowed, and of course
that flag is not on it.

diffstat:

 textproc/sift/Makefile                       |   7 +++++--
 textproc/sift/distinfo                       |   3 ++-
 textproc/sift/patches/patch-matching__cgo.go |  15 +++++++++++++++
 3 files changed, 22 insertions(+), 3 deletions(-)

diffs (54 lines):

diff -r a8febc74cb9b -r a9f986c6e9e6 textproc/sift/Makefile
--- a/textproc/sift/Makefile    Tue Mar 13 17:26:59 2018 +0000
+++ b/textproc/sift/Makefile    Tue Mar 13 17:28:59 2018 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2018/03/04 15:52:20 bsiegert Exp $
+# $NetBSD: Makefile,v 1.10 2018/03/13 17:28:59 bsiegert Exp $
 
 DISTNAME=      sift-0.6.0
-PKGREVISION=   7
+PKGREVISION=   8
 CATEGORIES=    textproc
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=svent/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}
@@ -14,6 +14,9 @@
 GO_DIST_BASE=  ${DISTNAME}
 GO_SRCPATH=    github.com/svent/sift
 
+post-install:
+       find ${DESTDIR}${PREFIX}/gopkg/src/${GO_SRCPATH} -name "*.orig" -exec ${RM} \{\} \;
+
 .include "../../security/go-crypto/buildlink3.mk"
 .include "../../devel/go-nbreader/buildlink3.mk"
 .include "../../devel/go-flags-svent/buildlink3.mk"
diff -r a8febc74cb9b -r a9f986c6e9e6 textproc/sift/distinfo
--- a/textproc/sift/distinfo    Tue Mar 13 17:26:59 2018 +0000
+++ b/textproc/sift/distinfo    Tue Mar 13 17:28:59 2018 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.1 2015/12/27 20:50:40 wiz Exp $
+$NetBSD: distinfo,v 1.2 2018/03/13 17:28:59 bsiegert Exp $
 
 SHA1 (sift-0.6.0.tar.gz) = eae22261ed09cff6bb1b21bb2fcb0d0c28f6ab81
 RMD160 (sift-0.6.0.tar.gz) = ee9c6119e53503496b3c748fec292130e015cda5
 SHA512 (sift-0.6.0.tar.gz) = 7a42a793cde876834468ef800e109dfb18dde28451cb05e3e3e9ac3cbe07d4f1c9bdc007c7e2ef84ebd3162753c698c177017e19cefa0a6d2cc2822d308204c9
 Size (sift-0.6.0.tar.gz) = 34032 bytes
+SHA1 (patch-matching__cgo.go) = 10b30a335e3e86616fe9dd9f97090adff1fd507a
diff -r a8febc74cb9b -r a9f986c6e9e6 textproc/sift/patches/patch-matching__cgo.go
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/textproc/sift/patches/patch-matching__cgo.go      Tue Mar 13 17:28:59 2018 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-matching__cgo.go,v 1.1 2018/03/13 17:28:59 bsiegert Exp $
+
+The -funroll-loops flag is not on the compiler flag whitelist.
+
+--- matching_cgo.go.orig       2015-12-23 00:37:41.000000000 +0000
++++ matching_cgo.go
+@@ -16,7 +16,7 @@
+ package main
+ 
+ /*
+-#cgo CFLAGS: -std=gnu99 -O2 -funroll-loops
++#cgo CFLAGS: -std=gnu99 -O2
+ 
+ #include <stddef.h>
+ 



Home | Main Index | Thread Index | Old Index