Attachment #208787 for bug #241663

View | Details | Raw Unified | Return to bug 241663
Collapse All | Expand All




# $FreeBSD$

PORTNAME=	ponyc
DISTVERSION=	0.33.0
CATEGORIES=	lang

MAINTAINER=	greg@unrelenting.technology

ONLY_FOR_ARCHS_REASON=	Undefined reference to __atomic_compare_exchange_8

BUILD_DEPENDS=	llvm-link${LLVM_VERSION}:devel/llvm${LLVM_VERSION}
RUN_DEPENDS=	llvm-link${LLVM_VERSION}:devel/llvm${LLVM_VERSION}

USES=		gmake ncurses compiler:c++11-lang


		prefix=${PREFIX} arch=${PONYARCH} \
		LLVM_CONFIG=llvm-config${LLVM_VERSION}

OPTIONS_DEFINE=			DOCS DTRACE EXAMPLES STATIC
OPTIONS_DEFAULT=		STATIC
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>

# Pony defaults to 'native', which

Lines 1-3 Link Here

(-)lang/ponyc/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1567360079	1	TIMESTAMP = 1572671022
2	SHA256 (ponylang-ponyc-0.31.0_GH0.tar.gz) = 74bb8ccbfc4201e14a2f66502033397d63179f073be04ee366a66d329dd56778	2	SHA256 (ponylang-ponyc-0.33.0_GH0.tar.gz) = e0bda6ba9d6a1f310cef1f3a223b804af454849ff005a437d118232fc7ebd55e
3	SIZE (ponylang-ponyc-0.31.0_GH0.tar.gz) = 1398974	3	SIZE (ponylang-ponyc-0.33.0_GH0.tar.gz) = 1419604




Avoid hardcoding /usr/local/bin/clang70 as fallback linker

--- Makefile-ponyc.orig	2019-11-02 05:19:12 UTC
+++ Makefile-ponyc
@@ -130,7 +130,7 @@ LINKER_FLAGS = -march=$(arch) -mtune=$(tune) $(LDFLAGS
 AR_FLAGS ?= rcs
 ALL_CFLAGS = -std=gnu11 -fexceptions \
   -DPONY_VERSION=\"$(tag)\" -DLLVM_VERSION=\"$(llvm_version)\" \
-  -DPONY_COMPILER=\"$(CC)\" -DPONY_ARCH=\"$(arch)\" \
+  -DPONY_COMPILER=\"/usr/bin/cc\" -DPONY_ARCH=\"$(arch)\" \
   -DBUILD_COMPILER=\"$(compiler_version)\" \
   -DPONY_BUILD_CONFIG=\"$(config)\" \
   -DPONY_VERSION_STR=\"$(version_str)\" \




lib/pony/%%VERSION%%/packages/builtin/env.pony
lib/pony/%%VERSION%%/packages/builtin/float.pony
lib/pony/%%VERSION%%/packages/builtin/iterator.pony
lib/pony/%%VERSION%%/packages/builtin/maybe_pointer.pony
lib/pony/%%VERSION%%/packages/builtin/none.pony
lib/pony/%%VERSION%%/packages/builtin/nullable_pointer.pony
lib/pony/%%VERSION%%/packages/builtin/platform.pony
lib/pony/%%VERSION%%/packages/builtin/pointer.pony
lib/pony/%%VERSION%%/packages/builtin/read_seq.pony
lib/pony/%%VERSION%%/packages/builtin/real.pony
lib/pony/%%VERSION%%/packages/builtin/runtime_options.pony
lib/pony/%%VERSION%%/packages/builtin/seq.pony
lib/pony/%%VERSION%%/packages/builtin/signed.pony
lib/pony/%%VERSION%%/packages/builtin/source_loc.pony

%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dtrace/scheduling.d
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dtrace/telemetry.d
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/echo/echo.pony
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fan-in/main.pony
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ffi-callbacks/callbacks.c
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ffi-callbacks/callbacks.pony
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ffi-struct/struct.c

Return to bug 241663

Lines 1-7 Link Here

(-)lang/ponyc/Makefile (-3 / +7 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= ponyc	3	PORTNAME= ponyc
4	DISTVERSION= 0.31.0	4	DISTVERSION= 0.33.0
5	CATEGORIES= lang	5	CATEGORIES= lang
6		6
7	MAINTAINER= greg@unrelenting.technology	7	MAINTAINER= greg@unrelenting.technology
Lines 14-20 Link Here
14	ONLY_FOR_ARCHS_REASON= Undefined reference to __atomic_compare_exchange_8	14	ONLY_FOR_ARCHS_REASON= Undefined reference to __atomic_compare_exchange_8
15		15
16	BUILD_DEPENDS= llvm-link${LLVM_VERSION}:devel/llvm${LLVM_VERSION}	16	BUILD_DEPENDS= llvm-link${LLVM_VERSION}:devel/llvm${LLVM_VERSION}
17	RUN_DEPENDS= llvm-link${LLVM_VERSION}:devel/llvm${LLVM_VERSION}
18		17
19	USES= gmake ncurses compiler:c++11-lang	18	USES= gmake ncurses compiler:c++11-lang
20		19
Lines 32-38 Link Here
32	prefix=${PREFIX} arch=${PONYARCH} \	31	prefix=${PREFIX} arch=${PONYARCH} \
33	LLVM_CONFIG=llvm-config${LLVM_VERSION}	32	LLVM_CONFIG=llvm-config${LLVM_VERSION}
34		33
35	OPTIONS_DEFINE= DOCS EXAMPLES DTRACE	34	OPTIONS_DEFINE= DOCS DTRACE EXAMPLES STATIC
		35	OPTIONS_DEFAULT= STATIC
36	OPTIONS_EXCLUDE_aarch64= DTRACE	36	OPTIONS_EXCLUDE_aarch64= DTRACE
37	# Not enabling DTrace by default yet because it breaks --runtimebc ("super LTO"):	37	# Not enabling DTrace by default yet because it breaks --runtimebc ("super LTO"):
38	# https://github.com/ponylang/ponyc/issues/2915	38	# https://github.com/ponylang/ponyc/issues/2915
Lines 39-44 Link Here
39		39
40	DTRACE_MAKE_ENV= use=dtrace	40	DTRACE_MAKE_ENV= use=dtrace
41		41
		42	STATIC_RUN_DEPENDS_OFF= llvm-link${LLVM_VERSION}:devel/llvm${LLVM_VERSION}
		43	STATIC_MAKE_ENV_OFF= link=llvm-dynamic
		44	STATIC_MAKE_ENV= link=llvm-static
		45
42	.include <bsd.port.pre.mk>	46	.include <bsd.port.pre.mk>
43		47
44	# Pony defaults to 'native', which	48	# Pony defaults to 'native', which

Line 0 Link Here

(-)lang/ponyc/files/patch-Makefile-ponyc (+13 lines)
	1	Avoid hardcoding /usr/local/bin/clang70 as fallback linker
	2
	3	--- Makefile-ponyc.orig 2019-11-02 05:19:12 UTC
	4	+++ Makefile-ponyc
	5	@@ -130,7 +130,7 @@ LINKER_FLAGS = -march=$(arch) -mtune=$(tune) $(LDFLAGS
	6	AR_FLAGS ?= rcs
	7	ALL_CFLAGS = -std=gnu11 -fexceptions \
	8	-DPONY_VERSION=\"$(tag)\" -DLLVM_VERSION=\"$(llvm_version)\" \
	9	- -DPONY_COMPILER=\"$(CC)\" -DPONY_ARCH=\"$(arch)\" \
	10	+ -DPONY_COMPILER=\"/usr/bin/cc\" -DPONY_ARCH=\"$(arch)\" \
	11	-DBUILD_COMPILER=\"$(compiler_version)\" \
	12	-DPONY_BUILD_CONFIG=\"$(config)\" \
	13	-DPONY_VERSION_STR=\"$(version_str)\" \

Lines 32-43 Link Here

(-)lang/ponyc/pkg-plist (-1 / +3 lines)
32	lib/pony/%%VERSION%%/packages/builtin/env.pony	32	lib/pony/%%VERSION%%/packages/builtin/env.pony
33	lib/pony/%%VERSION%%/packages/builtin/float.pony	33	lib/pony/%%VERSION%%/packages/builtin/float.pony
34	lib/pony/%%VERSION%%/packages/builtin/iterator.pony	34	lib/pony/%%VERSION%%/packages/builtin/iterator.pony
35	lib/pony/%%VERSION%%/packages/builtin/maybe_pointer.pony
36	lib/pony/%%VERSION%%/packages/builtin/none.pony	35	lib/pony/%%VERSION%%/packages/builtin/none.pony
		36	lib/pony/%%VERSION%%/packages/builtin/nullable_pointer.pony
37	lib/pony/%%VERSION%%/packages/builtin/platform.pony	37	lib/pony/%%VERSION%%/packages/builtin/platform.pony
38	lib/pony/%%VERSION%%/packages/builtin/pointer.pony	38	lib/pony/%%VERSION%%/packages/builtin/pointer.pony
39	lib/pony/%%VERSION%%/packages/builtin/read_seq.pony	39	lib/pony/%%VERSION%%/packages/builtin/read_seq.pony
40	lib/pony/%%VERSION%%/packages/builtin/real.pony	40	lib/pony/%%VERSION%%/packages/builtin/real.pony
		41	lib/pony/%%VERSION%%/packages/builtin/runtime_options.pony
41	lib/pony/%%VERSION%%/packages/builtin/seq.pony	42	lib/pony/%%VERSION%%/packages/builtin/seq.pony
42	lib/pony/%%VERSION%%/packages/builtin/signed.pony	43	lib/pony/%%VERSION%%/packages/builtin/signed.pony
43	lib/pony/%%VERSION%%/packages/builtin/source_loc.pony	44	lib/pony/%%VERSION%%/packages/builtin/source_loc.pony
Lines 202-207 Link Here
202	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dtrace/scheduling.d	203	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dtrace/scheduling.d
203	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dtrace/telemetry.d	204	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dtrace/telemetry.d
204	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/echo/echo.pony	205	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/echo/echo.pony
		206	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fan-in/main.pony
205	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ffi-callbacks/callbacks.c	207	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ffi-callbacks/callbacks.c
206	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ffi-callbacks/callbacks.pony	208	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ffi-callbacks/callbacks.pony
207	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ffi-struct/struct.c	209	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ffi-struct/struct.c