Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 28 Jul 2019 22:32:09 +0000 (UTC)
From:      Christoph Moench-Tegeder <cmt@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r507541 - in head/devel/erlang-cl: . files
Message-ID:  <201907282232.x6SMW9sW015178@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: cmt
Date: Sun Jul 28 22:32:08 2019
New Revision: 507541
URL: https://svnweb.freebsd.org/changeset/ports/507541

Log:
  devel/erlang-cl: update to 1.2.4
  
  While here, patch this port's build scripts to actually build the
  opencl NIF (Native Implemented Function) - the build system didn't know
  about FreeBSD and failed when building cl_nif.so, but the error went
  unnoticed. Without this object, erlang-cl cannot load any CL function
  (in our case, we want to use libOpenCL), which rather defeats the
  purpose of this port.
  
  Once we build and install cl_nif.so, we have to depend on devel/ocl-icd
  to pull in libOpenCL.
  
  PR:		239178
  Approved by:	maintainer-timeout (erlang@)

Added:
  head/devel/erlang-cl/files/
  head/devel/erlang-cl/files/patch-c__src_Makefile   (contents, props changed)
Modified:
  head/devel/erlang-cl/Makefile
  head/devel/erlang-cl/distinfo
  head/devel/erlang-cl/pkg-plist

Modified: head/devel/erlang-cl/Makefile
==============================================================================
--- head/devel/erlang-cl/Makefile	Sun Jul 28 22:25:20 2019	(r507540)
+++ head/devel/erlang-cl/Makefile	Sun Jul 28 22:32:08 2019	(r507541)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	cl
-PORTVERSION=	1.2.3
+PORTVERSION=	1.2.4
 DISTVERSIONPREFIX=	cl-
 CATEGORIES=	devel
 PKGNAMEPREFIX=	erlang-
@@ -14,17 +14,15 @@ LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
 BUILD_DEPENDS=	opencl>=0:devel/opencl
+LIB_DEPENDS=	libOpenCL.so:devel/ocl-icd
 
+USES=		gmake erlang:rebar3 localbase:ldflags
+
 USE_GITHUB=	yes
 GH_ACCOUNT=	tonyrog
 
-USES=		gmake erlang:rebar3 localbase
-
 PORTDOCS=	*
 
 OPTIONS_DEFINE=	DOCS
-
-post-build:
-	@${RMDIR} ${WRKSRC}/priv
 
 .include <bsd.port.mk>

Modified: head/devel/erlang-cl/distinfo
==============================================================================
--- head/devel/erlang-cl/distinfo	Sun Jul 28 22:25:20 2019	(r507540)
+++ head/devel/erlang-cl/distinfo	Sun Jul 28 22:32:08 2019	(r507541)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1479209283
-SHA256 (tonyrog-cl-cl-1.2.3_GH0.tar.gz) = a9731825ee9b8057006ebb6b472466d51278d1a0e1fa496cf132b5456c54f15b
-SIZE (tonyrog-cl-cl-1.2.3_GH0.tar.gz) = 137921
+TIMESTAMP = 1562967124
+SHA256 (tonyrog-cl-cl-1.2.4_GH0.tar.gz) = 577b8788029148f93217d00a1bbdc500db68ee77b2246bbd892269b5bb98c41a
+SIZE (tonyrog-cl-cl-1.2.4_GH0.tar.gz) = 142258

Added: head/devel/erlang-cl/files/patch-c__src_Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/erlang-cl/files/patch-c__src_Makefile	Sun Jul 28 22:32:08 2019	(r507541)
@@ -0,0 +1,16 @@
+--- c_src/Makefile.orig	2018-09-26 08:28:15 UTC
++++ c_src/Makefile
+@@ -59,6 +59,13 @@ LD_SHARED	:= $(CC) -shared
+ LDFLAGS	        += -lOpenCL
+ endif
+ 
++ifeq ($(OSNAME), FreeBSD)
++LINUX = Yes
++CFLAGS += -O3 -fPIC
++LD_SHARED	:= $(CC) -shared
++LDFLAGS	        += -lOpenCL
++endif
++
+ ifeq ($(OSNAME), Darwin)
+ MAC_OS_X = Yes
+ ifeq ($(WORDSIZE), 32)

Modified: head/devel/erlang-cl/pkg-plist
==============================================================================
--- head/devel/erlang-cl/pkg-plist	Sun Jul 28 22:25:20 2019	(r507540)
+++ head/devel/erlang-cl/pkg-plist	Sun Jul 28 22:32:08 2019	(r507541)
@@ -3,13 +3,12 @@ lib/erlang/lib/cl-%%VERSION%%/ebin/cl.beam
 lib/erlang/lib/cl-%%VERSION%%/ebin/cl10.beam
 lib/erlang/lib/cl-%%VERSION%%/ebin/cl11.beam
 lib/erlang/lib/cl-%%VERSION%%/ebin/cl12.beam
-lib/erlang/lib/cl-%%VERSION%%/ebin/cl13.beam
 lib/erlang/lib/cl-%%VERSION%%/ebin/clu.beam
 lib/erlang/lib/cl-%%VERSION%%/include/cl.hrl
+lib/erlang/lib/cl-%%VERSION%%/priv/cl_nif.so
 lib/erlang/lib/cl-%%VERSION%%/src/cl.app.src
 lib/erlang/lib/cl-%%VERSION%%/src/cl.erl
 lib/erlang/lib/cl-%%VERSION%%/src/cl10.erl
 lib/erlang/lib/cl-%%VERSION%%/src/cl11.erl
 lib/erlang/lib/cl-%%VERSION%%/src/cl12.erl
-lib/erlang/lib/cl-%%VERSION%%/src/cl13.erl
 lib/erlang/lib/cl-%%VERSION%%/src/clu.erl



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