Page MenuHomeFreeBSD
Files F133495882

D22291.id64576.diff
No OneTemporary
Actions

D22291.id64576.diff
View Options

Index: MOVED
===================================================================
--- MOVED
+++ MOVED
@@ -13482,3 +13482,4 @@
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-19|Flavored
Index: lang/Makefile
===================================================================
--- lang/Makefile
+++ lang/Makefile
@@ -286,7 +286,6 @@
SUBDIR += pocl
SUBDIR += polyml
SUBDIR += ponyc
- SUBDIR += ponyc-static
SUBDIR += ptoc
SUBDIR += purescript
SUBDIR += py-hy
Index: lang/ponyc-static/Makefile
===================================================================
--- lang/ponyc-static/Makefile
+++ lang/ponyc-static/Makefile
@@ -1,9 +0,0 @@
-# $FreeBSD$
-
-PKGNAMESUFFIX= -static
-COMMENT= Pony language compiler (statically linked with LLVM)
-CONFLICTS_INSTALL= ponyc
-MASTERDIR= ${.CURDIR}/../ponyc
-OPTIONS_SLAVE= STATIC
-
-.include "${MASTERDIR}/Makefile"
Index: lang/ponyc/Makefile
===================================================================
--- lang/ponyc/Makefile
+++ lang/ponyc/Makefile
@@ -5,7 +5,7 @@
CATEGORIES= lang
MAINTAINER= greg@unrelenting.technology
-COMMENT?= Pony language compiler
+COMMENT= Pony language compiler
LICENSE= BSD2CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
@@ -15,6 +15,17 @@
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 @@
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>

File Metadata

Mime Type
text/plain
Expires
Mon, Oct 27, 5:21 AM (9 h, 29 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
24273329
Default Alt Text
D22291.id64576.diff (2 KB)

Event Timeline