Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 19 Oct 2019 04:50:09 +0000 (UTC)
From:      Yuri Victorovich <yuri@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r514749 - head/devel/emscripten
Message-ID:  <201910190450.x9J4o9eQ070252@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: yuri
Date: Sat Oct 19 04:50:09 2019
New Revision: 514749
URL: https://svnweb.freebsd.org/changeset/ports/514749

Log:
  devel/emscripten: Correct LLVM path; Correct EMSCRIPTEN path; Add node and libunwind dependencies
  
  PR:		241337 (missing unwind.h)
  Reported by:	ichino@coreappli.jp

Modified:
  head/devel/emscripten/Makefile

Modified: head/devel/emscripten/Makefile
==============================================================================
--- head/devel/emscripten/Makefile	Sat Oct 19 04:17:32 2019	(r514748)
+++ head/devel/emscripten/Makefile	Sat Oct 19 04:50:09 2019	(r514749)
@@ -2,6 +2,7 @@
 
 PORTNAME=	emscripten
 DISTVERSION=	1.38.48
+PORTREVISION=	1
 CATEGORIES=	devel www
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -10,7 +11,10 @@ COMMENT=	LLVM-to-Web Compiler
 LICENSE=	MIT NCSA
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	llvm-devel>0:devel/llvm-devel # the upstream requires to use either the latest llvm version, or their own llvm fork called emscripten-fastcomp
+RUN_DEPENDS=	llvm-devel>0:devel/llvm-devel \
+		node:www/node \
+		${LOCALBASE}/include/unwind.h:devel/libunwind
+		# the upstream requires to use either the latest llvm version, or their own llvm fork called emscripten-fastcomp \
 
 USES=		python shebangfix
 USE_GITHUB=	yes
@@ -27,7 +31,14 @@ NO_ARCH=	yes
 PORTSCOUT=	skipv:i64
 
 post-patch:
-	@${REINPLACE_CMD} -i '' -E "s|^__rootpath__ = .*|__rootpath__ = '${PREFIX}/lib/${PORTNAME}'|" ${WRKSRC}/tools/shared.py
+	@${REINPLACE_CMD} -i '' -E " \
+			s|^__rootpath__ = .*|__rootpath__ = '${PREFIX}/lib/${PORTNAME}'| ; \
+			s|find_executable\('llvm-dis'\) or '/usr/bin/llvm-dis'|'${LOCALBASE}/bin/llvm-dis'| ; \
+			s|'-target', get_llvm_target\(\),|& '-I${LOCALBASE}/include',|" \
+			${WRKSRC}/tools/shared.py
+	@${REINPLACE_CMD} -i '' -E " \
+			s|os.getenv\('BINARYEN', ''\)|os.getenv('BINARYEN', '${LOCALBASE}')|" \
+			${WRKSRC}/tools/settings_template_readonly.py
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}



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