Attachment 162572 Details for Bug 203991 – 32 bit combatibility patch

[patch] 32 bit combatibility patch

ipfw-go.patch (text/plain), 1.87 KB, created by Dmitry Marakasov on 2015-10-29 16:34:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dmitry Marakasov

Created: 2015-10-29 16:34:12 UTC

Size: 1.87 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 400208)
>+++ Makefile	(working copy)
>@@ -16,9 +16,6 @@
> GH_ACCOUNT=	ipfs
> GH_PROJECT=	go-ipfs
> 
>-ONLY_FOR_ARCHS=	amd64
>-ONLY_FOR_ARCHS_REASON=	Does not build on i386 due to a dependency
>-
> MAKE_ENV+=	GOPATH=${WRKSRC}
> 
> PLIST_FILES=	bin/${PORTNAME}
>@@ -27,6 +24,12 @@
> 
> STRIP=		# stripping can break go binaries
> 
>+.include <bsd.port.pre.mk>
>+
>+.if ${ARCH} == i386
>+EXTRA_PATCHES+=	${FILESDIR}/extra-patch-32bit
>+.endif
>+
> # Prepare for possible extra modules in future
> post-extract:
> 	@${MKDIR} ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT}
>@@ -41,4 +44,4 @@
> do-install:
> 	${INSTALL_PROGRAM} ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT}/cmd/ipfs/ipfs ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
> 
>-.include <bsd.port.mk>
>+.include <bsd.port.post.mk>
>Index: files/extra-patch-32bit
>===================================================================
>--- files/extra-patch-32bit	(nonexistent)
>+++ files/extra-patch-32bit	(working copy)
>@@ -0,0 +1,11 @@
>+--- src/github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-reuseport/poll/poll_bsd.go.orig	2015-08-02 14:00:34 UTC
>++++ src/github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-reuseport/poll/poll_bsd.go
>+@@ -21,7 +21,7 @@ func New(fd int) (p *Poller, err error) 
>+ 	}
>+ 
>+ 	p.event = syscall.Kevent_t{
>+-		Ident:  uint64(fd),
>++		Ident:  uint32(fd),
>+ 		Filter: syscall.EVFILT_WRITE,
>+ 		Flags:  syscall.EV_ADD | syscall.EV_ENABLE | syscall.EV_ONESHOT,
>+ 		Fflags: 0,
>
>Property changes on: files/extra-patch-32bit
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 203991: 162484 | 162572