Sun Aug 30 12:30:33 2015 UTC ()
Don't strip on Darwin, fails on dyntrace.o, and enable kernel poll.  Both
patches from Steven Williamson.


(jperkin)
diff -r1.69 -r1.70 pkgsrc/lang/erlang/Makefile
cvs diff -r1.69 -r1.70 pkgsrc/lang/erlang/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/erlang/Makefile 2015/07/18 13:47:42 1.69
+++ pkgsrc/lang/erlang/Makefile 2015/08/30 12:30:33 1.70
@@ -1,40 +1,45 @@ @@ -1,40 +1,45 @@
1# $NetBSD: Makefile,v 1.69 2015/07/18 13:47:42 fhajny Exp $ 1# $NetBSD: Makefile,v 1.70 2015/08/30 12:30:33 jperkin Exp $
2 2
3DISTNAME= otp_src_${DIST_VERSION_MAJOR}.${DIST_VERSION_MINOR} 3DISTNAME= otp_src_${DIST_VERSION_MAJOR}.${DIST_VERSION_MINOR}
4PKGNAME= ${DISTNAME:S/otp_src_/erlang-/} 4PKGNAME= ${DISTNAME:S/otp_src_/erlang-/}
5PKGREVISION= 1 5PKGREVISION= 1
6CATEGORIES= lang 6CATEGORIES= lang
7MASTER_SITES= http://www.erlang.org/download/ 7MASTER_SITES= http://www.erlang.org/download/
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.erlang.org/ 10HOMEPAGE= http://www.erlang.org/
11COMMENT= Concurrent functional programming language 11COMMENT= Concurrent functional programming language
12LICENSE= apache-2.0 12LICENSE= apache-2.0
13 13
14DIST_SUBDIR= erlang 14DIST_SUBDIR= erlang
15 15
16GNU_CONFIGURE= yes 16GNU_CONFIGURE= yes
17USE_GNU_CONFIGURE_HOST= ${USE_CROSS_COMPILE} 17USE_GNU_CONFIGURE_HOST= ${USE_CROSS_COMPILE}
18OVERRIDE_DIRDEPTH= 4 18OVERRIDE_DIRDEPTH= 4
19USE_TOOLS+= gmake perl:run flex 19USE_TOOLS+= gmake perl:run flex
20 20
21CONFIGURE_ARGS+= --with-ssl=${BUILDLINK_PREFIX.openssl} 21CONFIGURE_ARGS+= --with-ssl=${BUILDLINK_PREFIX.openssl}
22 22
23PTHREAD_OPTS+= require native 23PTHREAD_OPTS+= require native
24CONFIGURE_ARGS+= --enable-threads 24CONFIGURE_ARGS+= --enable-threads
25 25
26.include "../../mk/bsd.prefs.mk" 26.include "../../mk/bsd.prefs.mk"
27 27
 28# Fails trying to strip dyntrace.o
 29.if ${OPSYS} == "Darwin"
 30INSTALL_UNSTRIPPED= yes
 31.endif
 32
28# have gcc without the necessary atomic ops? 33# have gcc without the necessary atomic ops?
29.if !empty(MACHINE_PLATFORM:MNetBSD-[56].*) 34.if !empty(MACHINE_PLATFORM:MNetBSD-[56].*)
30 35
31# a machine without native ethread implementation? 36# a machine without native ethread implementation?
32.if empty(MACHINE_PLATFORM:M*i386) &&\ 37.if empty(MACHINE_PLATFORM:M*i386) &&\
33 empty(MACHINE_PLATFORM:M*sparc) &&\ 38 empty(MACHINE_PLATFORM:M*sparc) &&\
34 empty(MACHINE_PLATFORM:M*sparc64) &&\ 39 empty(MACHINE_PLATFORM:M*sparc64) &&\
35 empty(MACHINE_PLATFORM:M*powerpc) &&\ 40 empty(MACHINE_PLATFORM:M*powerpc) &&\
36 empty(MACHINE_PLATFORM:M*x86_64) 41 empty(MACHINE_PLATFORM:M*x86_64)
37 42
38CONFIGURE_ARGS+= --disable-native-ethr-impls\ 43CONFIGURE_ARGS+= --disable-native-ethr-impls\
39 --disable-smp-require-native-atomics 44 --disable-smp-require-native-atomics
40 45
@@ -63,27 +68,27 @@ SUBST_MESSAGE.target= Fixing target name @@ -63,27 +68,27 @@ SUBST_MESSAGE.target= Fixing target name
63 68
64TEST_TARGET= tests 69TEST_TARGET= tests
65TEST_MAKE_FLAGS= ERL_TOP=${WRKSRC} 70TEST_MAKE_FLAGS= ERL_TOP=${WRKSRC}
66REPLACE_PERL+= make/make_emakefile 71REPLACE_PERL+= make/make_emakefile
67 72
68SMF_NAME= epmd 73SMF_NAME= epmd
69 74
70.if ${OPSYS} == "DragonFly" 75.if ${OPSYS} == "DragonFly"
71CONFIGURE_ARGS+= --disable-sctp 76CONFIGURE_ARGS+= --disable-sctp
72.endif 77.endif
73### 78###
74### XXX There may be others here. 79### XXX There may be others here.
75### 80###
76.if ${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD" 81.if ${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD" || ${OPSYS} == "Darwin"
77CONFIGURE_ARGS+= --enable-kernel-poll 82CONFIGURE_ARGS+= --enable-kernel-poll
78.endif 83.endif
79 84
80.include "options.mk" 85.include "options.mk"
81 86
82.include "Makefile.versions" 87.include "Makefile.versions"
83 88
84### 89###
85### Ensure this gets rebuilt. 90### Ensure this gets rebuilt.
86### 91###
87pre-build: 92pre-build:
88 ${RUN} ${RM} -f ${WRKSRC}/lib/stdlib/ebin/dets_v9.beam 93 ${RUN} ${RM} -f ${WRKSRC}/lib/stdlib/ebin/dets_v9.beam
89 94