Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 19 Feb 2018 13:02:25 +0000 (UTC)
From:      "Lev A. Serebryakov" <lev@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r462314 - in head/devel/stlink: . files
Message-ID:  <201802191302.w1JD2PC4079367@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: lev
Date: Mon Feb 19 13:02:25 2018
New Revision: 462314
URL: https://svnweb.freebsd.org/changeset/ports/462314

Log:
   Update to 1.5.0 and fix on 32 bit platforms.

Added:
  head/devel/stlink/files/extra-pacth-32bit   (contents, props changed)
Modified:
  head/devel/stlink/Makefile
  head/devel/stlink/distinfo

Modified: head/devel/stlink/Makefile
==============================================================================
--- head/devel/stlink/Makefile	Mon Feb 19 12:50:30 2018	(r462313)
+++ head/devel/stlink/Makefile	Mon Feb 19 13:02:25 2018	(r462314)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	stlink
-PORTVERSION=	1.4.0
+PORTVERSION=	1.5.0
 PORTREVISION=	0
 CATEGORIES=	devel
 
@@ -23,10 +23,16 @@ USE_LDCONFIG=	yes
 
 PORTDOCS=	README.md tested-boards.md tutorial.md
 
+.include <bsd.port.pre.mk>
+
+.if ${ARCH} == "i386" || ${ARCH} == "powerpc" || ${ARCH} == "arm" || ${ARCH} == "armv6" || ${ARCH} == "mips"
+EXTRA_PATCHES+=	${FILESDIR}/extra-pacth-32bit
+.endif
+
 post-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}/README.md
 	${INSTALL_DATA} ${WRKSRC}/doc/tested-boards.md ${STAGEDIR}${DOCSDIR}/tested-boards.md
 	${INSTALL_DATA} ${WRKSRC}/doc/tutorial.md ${STAGEDIR}${DOCSDIR}/tutorial.md
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>

Modified: head/devel/stlink/distinfo
==============================================================================
--- head/devel/stlink/distinfo	Mon Feb 19 12:50:30 2018	(r462313)
+++ head/devel/stlink/distinfo	Mon Feb 19 13:02:25 2018	(r462314)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1503328091
-SHA256 (texane-stlink-1.4.0_GH0.tar.gz) = d99b8385cce8071d5e58de21b6c8866058af20a8dd46ecf01e1c1dc3aa038cc9
-SIZE (texane-stlink-1.4.0_GH0.tar.gz) = 138765
+TIMESTAMP = 1519044524
+SHA256 (texane-stlink-1.5.0_GH0.tar.gz) = ce26b3db73f0bdf87ced78a2a90f3d515914f7d1211b1ca4b9acdf1882ca9d81
+SIZE (texane-stlink-1.5.0_GH0.tar.gz) = 140486

Added: head/devel/stlink/files/extra-pacth-32bit
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/stlink/files/extra-pacth-32bit	Mon Feb 19 13:02:25 2018	(r462314)
@@ -0,0 +1,18 @@
+--- src/common.c.orig	2018-02-19 15:59:51.068865000 +0300
++++ src/common.c	2018-02-19 16:00:23.483652000 +0300
+@@ -1032,13 +1032,13 @@
+         goto on_error;
+     }
+ 
+-    mf->base = (uint8_t*) mmap(NULL, st.st_size, PROT_READ, MAP_SHARED, fd, 0);
++    mf->base = (uint8_t*) mmap(NULL, (size_t)st.st_size, PROT_READ, MAP_SHARED, fd, 0);
+     if (mf->base == MAP_FAILED) {
+         fprintf(stderr, "mmap() == MAP_FAILED\n");
+         goto on_error;
+     }
+ 
+-    mf->len = st.st_size;
++    mf->len = (size_t)st.st_size;
+ 
+     /* success */
+     error = 0;



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201802191302.w1JD2PC4079367>