Attachment 208787 Details for Bug 241663 – ponyc.diff

[patch] ponyc.diff

ponyc.diff (text/plain), 4.23 KB, created by Tobias Kortkamp on 2019-11-02 05:55:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tobias Kortkamp

Created: 2019-11-02 05:55:15 UTC

Size: 4.23 KB

patch

obsolete

>Index: lang/ponyc/Makefile
>===================================================================
>--- lang/ponyc/Makefile	(revision 516270)
>+++ lang/ponyc/Makefile	(working copy)
>@@ -1,7 +1,7 @@
> # $FreeBSD$
> 
> PORTNAME=	ponyc
>-DISTVERSION=	0.31.0
>+DISTVERSION=	0.33.0
> CATEGORIES=	lang
> 
> MAINTAINER=	greg@unrelenting.technology
>@@ -14,7 +14,6 @@
> 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
> 
>@@ -32,7 +31,8 @@
> 		prefix=${PREFIX} arch=${PONYARCH} \
> 		LLVM_CONFIG=llvm-config${LLVM_VERSION}
> 
>-OPTIONS_DEFINE=			DOCS EXAMPLES DTRACE
>+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
>@@ -39,6 +39,10 @@
> 
> 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
>Index: lang/ponyc/distinfo
>===================================================================
>--- lang/ponyc/distinfo	(revision 516270)
>+++ lang/ponyc/distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1567360079
>-SHA256 (ponylang-ponyc-0.31.0_GH0.tar.gz) = 74bb8ccbfc4201e14a2f66502033397d63179f073be04ee366a66d329dd56778
>-SIZE (ponylang-ponyc-0.31.0_GH0.tar.gz) = 1398974
>+TIMESTAMP = 1572671022
>+SHA256 (ponylang-ponyc-0.33.0_GH0.tar.gz) = e0bda6ba9d6a1f310cef1f3a223b804af454849ff005a437d118232fc7ebd55e
>+SIZE (ponylang-ponyc-0.33.0_GH0.tar.gz) = 1419604
>Index: lang/ponyc/files/patch-Makefile-ponyc
>===================================================================
>--- lang/ponyc/files/patch-Makefile-ponyc	(nonexistent)
>+++ lang/ponyc/files/patch-Makefile-ponyc	(working copy)
>@@ -0,0 +1,13 @@
>+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)\" \
>
>Property changes on: lang/ponyc/files/patch-Makefile-ponyc
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: lang/ponyc/pkg-plist
>===================================================================
>--- lang/ponyc/pkg-plist	(revision 516270)
>+++ lang/ponyc/pkg-plist	(working copy)
>@@ -32,12 +32,13 @@
> 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
>@@ -202,6 +203,7 @@
> %%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

Flags:

val: maintainer-approval+

Actions: View | Diff

Attachments on bug 241663: 208787