Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 20 Nov 2019 17:13:33 +0000 (UTC)
From:      Tobias Kortkamp <tobik@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r518038 - in head: . lang lang/ponyc lang/ponyc-static
Message-ID:  <201911201713.xAKHDXjG006046@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: tobik
Date: Wed Nov 20 17:13:32 2019
New Revision: 518038
URL: https://svnweb.freebsd.org/changeset/ports/518038

Log:
  Make lang/ponyc-static a flavor of lang/ponyc
  
  Approved by:	portmgr (mat), greg@unrelenting.technology (maintainer)
  Differential Revision:	https://reviews.freebsd.org/D22291

Deleted:
  head/lang/ponyc-static/
Modified:
  head/MOVED
  head/lang/Makefile
  head/lang/ponyc/Makefile

Modified: head/MOVED
==============================================================================
--- head/MOVED	Wed Nov 20 16:52:26 2019	(r518037)
+++ head/MOVED	Wed Nov 20 17:13:32 2019	(r518038)
@@ -13482,3 +13482,4 @@ mail/opensmtpd-extras-filter-regex||2019-11-15| Deprec
 mail/opensmtpd-extras-filter-spamassassin||2019-11-15| Deprecated upstream
 mail/opensmtpd-extras-tool-stats||2019-11-15| Deprecated upstream
 x11-wm/compton-yshui|x11-wm/picom|2019-11-18|Project renamed
+lang/ponyc-static|lang/ponyc@llvm_static|2019-11-20|Flavored

Modified: head/lang/Makefile
==============================================================================
--- head/lang/Makefile	Wed Nov 20 16:52:26 2019	(r518037)
+++ head/lang/Makefile	Wed Nov 20 17:13:32 2019	(r518038)
@@ -286,7 +286,6 @@
     SUBDIR += pocl
     SUBDIR += polyml
     SUBDIR += ponyc
-    SUBDIR += ponyc-static
     SUBDIR += ptoc
     SUBDIR += purescript
     SUBDIR += py-hy

Modified: head/lang/ponyc/Makefile
==============================================================================
--- head/lang/ponyc/Makefile	Wed Nov 20 16:52:26 2019	(r518037)
+++ head/lang/ponyc/Makefile	Wed Nov 20 17:13:32 2019	(r518038)
@@ -5,7 +5,7 @@ DISTVERSION=	0.33.0
 CATEGORIES=	lang
 
 MAINTAINER=	greg@unrelenting.technology
-COMMENT?=	Pony language compiler
+COMMENT=	Pony language compiler
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
@@ -15,6 +15,17 @@ ONLY_FOR_ARCHS_REASON=	Undefined reference to __atomic
 
 BUILD_DEPENDS=	llvm-link${LLVM_VERSION}:devel/llvm${LLVM_VERSION}
 
+FLAVORS=	llvm_dynamic llvm_static
+FLAVOR?=	${FLAVORS:[1]}
+
+llvm_dynamic_RUN_DEPENDS=	llvm-link${LLVM_VERSION}:devel/llvm${LLVM_VERSION}
+llvm_dynamic_CONFLICTS_INSTALL=	ponyc-static
+llvm_static_PKGNAMESUFFIX=	-static
+llvm_static_CONFLICTS_INSTALL=	ponyc
+.if ${FLAVOR} == llvm_static
+COMMENT+=			(statically linked with LLVM)
+.endif
+
 USES=		gmake ncurses compiler:c++11-lang
 
 LLVM_VERSION?=	70
@@ -30,19 +41,18 @@ PORTDOCS=	*.md
 MAKE_ENV=	config=release verbose=true default_pic=true \
 		prefix=${PREFIX} arch=${PONYARCH} \
 		LLVM_CONFIG=llvm-config${LLVM_VERSION}
+.if ${FLAVOR} == llvm_dynamic
+MAKE_ENV+=	link=llvm-dynamic
+.else
+MAKE_ENV+=	link=llvm-static
+.endif
 
-CONFLICTS_INSTALL?=	ponyc-static
-
-OPTIONS_DEFINE=			DOCS DTRACE EXAMPLES STATIC
+OPTIONS_DEFINE=			DOCS DTRACE EXAMPLES
 OPTIONS_EXCLUDE_aarch64=	DTRACE
 # Not enabling DTrace by default yet because it breaks --runtimebc ("super LTO"):
 # https://github.com/ponylang/ponyc/issues/2915
 
 DTRACE_MAKE_ENV=		use=dtrace
-
-STATIC_RUN_DEPENDS_OFF=	llvm-link${LLVM_VERSION}:devel/llvm${LLVM_VERSION}
-STATIC_MAKE_ENV_OFF=	link=llvm-dynamic
-STATIC_MAKE_ENV=	link=llvm-static
 
 .include <bsd.port.pre.mk>
 



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