cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- cleanup CONFIGURE_ARGS:

Browse Source 
* use correct switch to disable jinterface and odbc and remove now bogus pre-configure target
- sort gen-versions output
This commit is contained in:
jasper 2015-06-23 20:51:57 +00:00
parent e009b7cc20
commit e3a96e6180
5 changed files with 155 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lang/erlang/16/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.5 2015/06/23 19:41:20 jasper Exp $
# $OpenBSD: Makefile,v 1.6 2015/06/23 20:51:57 jasper Exp $
BROKEN-alpha= beam/erl_process.c:6692: internal compiler error: in final_scan_insn, at final.c:2449
BROKEN-hppa = error: No native atomic implementation found.
@ -13,8 +13,8 @@ PKGSPEC= erlang->=16v0,<17v0
WANTLIB= c crypto m ncurses pthread util
CONFIGURE_ARGS= --disable-jinterface \
--disable-odbc \
CONFIGURE_ARGS= --without-jinterface \
--without-odbc \
--enable-threads \
--enable-kernel-poll \
--disable-hipe \
@ -82,19 +82,6 @@ XMERL_VSN 1.3.6 \
WEBTOOL_VSN 0.8.9.2 \
ERTS_VSN 5.10.4
# special cases
EI= erl_interface-${EI_VSN}
COSEVENT= cosEvent-${COSEVENT_VSN}
COSEVENTDOMAIN= cosEventDomain-${COSEVENTDOMAIN_VSN}
COSFILETRANSFER=cosFileTransfer-${COSFILETRANSFER_VSN}
COSNOTIFICATION=cosNotification-${COSNOTIFICATION_VSN}
COSPROPERTY= cosProperty-${COSPROPERTY_VSN}
COSTIME= cosTime-${COSTIME_VSN}
COSTRANSACTIONS=cosTransactions-${COSTRANSACTIONS_VSN}
post-configure:
@touch ${WRKSRC}/lib/odbc/SKIP
post-install:
@ln -sf ../lib/erlang/lib/${EI}/bin/erl_call ${PREFIX}/bin/erl_call
tar zxf ${FULLDISTDIR}/otp_doc_man_${V}.tar.gz -C ${DOC_DIR}

127
lang/erlang/17/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.3 2015/06/23 19:41:20 jasper Exp $
# $OpenBSD: Makefile,v 1.4 2015/06/23 20:51:58 jasper Exp $
BROKEN-alpha= beam/erl_process.c:6692: internal compiler error: in final_scan_insn, at final.c:2449
BROKEN-hppa = error: No native atomic implementation found.
@ -12,8 +12,8 @@ PKGSPEC= erlang->=17v0,<18v0
WANTLIB= c crypto m ncurses pthread util
CONFIGURE_ARGS= --disable-jinterface \
--disable-odbc \
CONFIGURE_ARGS= --without-jinterface \
--without-odbc \
--enable-threads \
--enable-kernel-poll \
--disable-hipe \
@ -23,76 +23,63 @@ DOC_DIR= ${PREFIX}/lib/erlang
# Use the target 'gen-versions' to update this list
ERL_VERSIONS= \
ELDAP_VSN 1.1.1 \
COSEVENT_VSN 2.1.15 \
OSE_VSN 1.0.2 \
ODBC_VSN 2.10.22 \
EMACS_VSN 2.7.0 \
TOOLS_VSN 2.7.2 \
DEBUGGER_VSN 4.0.3 \
COSTIME_VSN 1.1.14 \
OBSERVER_VSN 2.0.4 \
COMPILER_VSN 5.0.4 \
IC_VSN 4.3.6 \
JINTERFACE_VSN 1.5.12 \
ET_VSN 1.5 \
OTP_MIBS_VSN 1.0.10 \
INETS_VSN 5.10.6 \
TYPER_VSN 0.9.8 \
TEST_SERVER_VSN 3.8 \
EDOC_VSN 0.7.16 \
SSH_VSN 3.2 \
COSFILETRANSFER_VSN 1.1.16 \
SNMP_VSN 5.1.1 \
ASN1_VSN 3.0.4 \
SYNTAX_TOOLS_VSN 1.6.18 \
XMERL_VSN 1.3.7 \
RELTOOL_VSN 0.6.6 \
ORBER_VSN 3.7.1 \
DIAMETER_VSN 1.9 \
CRYPTO_VSN 3.5 \
COSTRANSACTIONS_VSN 1.2.14 \
WX_VSN 1.3.3 \
MEGACO_VSN 3.17.3 \
ERL_DOCGEN_VSN 0.3.7 \
GS_VSN 1.5.16 \
EI_VSN 3.7.20 \
ERL_INTERFACE_VSN 3.7.20 \
DIALYZER_VSN 2.7.4 \
PERCEPT_VSN 0.8.10 \
HIPE_VSN 3.11.3 \
SSL_VSN 6.0 \
KERNEL_VSN 3.2 \
RUNTIME_TOOLS_VSN 1.8.16 \
COMMON_TEST_VSN 1.10 \
EUNIT_VSN 2.2.9 \
PUBLIC_KEY_VSN 0.23 \
PARSETOOLS_VSN 2.0.12 \
SASL_VSN 2.4.1 \
COSPROPERTY_VSN 1.1.17 \
STDLIB_VSN 2.4 \
COSEVENTDOMAIN_VSN 1.1.14 \
OS_MON_VSN 2.3.1 \
COSNOTIFICATION_VSN 1.1.21 \
MNESIA_VSN 4.12.5 \
WEBTOOL_VSN 0.8.10 \
ERTS_VSN 6.4
ASN1_VSN 3.0.4 \
COMMON_TEST_VSN 1.10 \
COMPILER_VSN 5.0.4 \
COSEVENTDOMAIN_VSN 1.1.14 \
COSEVENT_VSN 2.1.15 \
COSFILETRANSFER_VSN 1.1.16 \
COSNOTIFICATION_VSN 1.1.21 \
COSPROPERTY_VSN 1.1.17 \
COSTIME_VSN 1.1.14 \
COSTRANSACTIONS_VSN 1.2.14 \
CRYPTO_VSN 3.5 \
DEBUGGER_VSN 4.0.3 \
DIALYZER_VSN 2.7.4 \
DIAMETER_VSN 1.9 \
EDOC_VSN 0.7.16 \
EI_VSN 3.7.20 \
ELDAP_VSN 1.1.1 \
EMACS_VSN 2.7.0 \
ERL_DOCGEN_VSN 0.3.7 \
ERL_INTERFACE_VSN 3.7.20 \
ET_VSN 1.5 \
EUNIT_VSN 2.2.9 \
GS_VSN 1.5.16 \
HIPE_VSN 3.11.3 \
IC_VSN 4.3.6 \
INETS_VSN 5.10.6 \
JINTERFACE_VSN 1.5.12 \
KERNEL_VSN 3.2 \
MEGACO_VSN 3.17.3 \
MNESIA_VSN 4.12.5 \
OBSERVER_VSN 2.0.4 \
ODBC_VSN 2.10.22 \
ORBER_VSN 3.7.1 \
OSE_VSN 1.0.2 \
OS_MON_VSN 2.3.1 \
OTP_MIBS_VSN 1.0.10 \
PARSETOOLS_VSN 2.0.12 \
PERCEPT_VSN 0.8.10 \
PUBLIC_KEY_VSN 0.23 \
RELTOOL_VSN 0.6.6 \
RUNTIME_TOOLS_VSN 1.8.16 \
SASL_VSN 2.4.1 \
SNMP_VSN 5.1.1 \
SSH_VSN 3.2 \
SSL_VSN 6.0 \
STDLIB_VSN 2.4 \
SYNTAX_TOOLS_VSN 1.6.18 \
TEST_SERVER_VSN 3.8 \
TOOLS_VSN 2.7.2 \
TYPER_VSN 0.9.8 \
WX_VSN 1.3.3 \
XMERL_VSN 1.3.7 \
WEBTOOL_VSN 0.8.10 \
ERTS_VSN 6.4
SYSTEM_VSN= ${V:R}
# special cases
EI= erl_interface-${EI_VSN}
COSEVENT= cosEvent-${COSEVENT_VSN}
COSEVENTDOMAIN= cosEventDomain-${COSEVENTDOMAIN_VSN}
COSFILETRANSFER=cosFileTransfer-${COSFILETRANSFER_VSN}
COSNOTIFICATION=cosNotification-${COSNOTIFICATION_VSN}
COSPROPERTY= cosProperty-${COSPROPERTY_VSN}
COSTIME= cosTime-${COSTIME_VSN}
COSTRANSACTIONS=cosTransactions-${COSTRANSACTIONS_VSN}
post-configure:
@touch ${WRKSRC}/lib/odbc/SKIP
post-install:
@ln -sf ../lib/erlang/lib/${EI}/bin/erl_call ${PREFIX}/bin/erl_call
tar zxf ${FULLDISTDIR}/otp_doc_man_${V}.tar.gz -C ${DOC_DIR}

3
lang/erlang/Makefile
View File

@ -1,6 +1,7 @@
# $OpenBSD: Makefile,v 1.62 2015/06/22 13:07:39 jasper Exp $
# $OpenBSD: Makefile,v 1.63 2015/06/23 20:51:57 jasper Exp $
SUBDIR =
SUBDIR += 16
SUBDIR += 17
.include <bsd.port.subdir.mk>

19
lang/erlang/Makefile.inc
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile.inc,v 1.4 2015/06/23 19:41:20 jasper Exp $
# $OpenBSD: Makefile.inc,v 1.5 2015/06/23 20:51:57 jasper Exp $
COMMENT ?= real-time, concurrent and distributed functional language
@ -25,7 +25,6 @@ AUTOCONF_DIR ?= ${WRKSRC} \
MODGNU_CONFIG_GUESS_DIRS ?= ${WRKSRC}/erts/autoconf \
${WRKSRC}/lib/erl_interface/src/auxdir
.if ${MACHINE_ARCH} == i386
CONFIGURE_ARGS += --enable-ethread-pre-pentium4-compatibility
.elif ${MACHINE_ARCH} == sparc64
@ -47,9 +46,19 @@ SUBST_VARS+=${_n:S/_VSN//}
SUBST_VARS+=SYSTEM_VSN
# special cases
EI= erl_interface-${EI_VSN}
COSEVENT= cosEvent-${COSEVENT_VSN}
COSEVENTDOMAIN= cosEventDomain-${COSEVENTDOMAIN_VSN}
COSFILETRANSFER=cosFileTransfer-${COSFILETRANSFER_VSN}
COSNOTIFICATION=cosNotification-${COSNOTIFICATION_VSN}
COSPROPERTY= cosProperty-${COSPROPERTY_VSN}
COSTIME= cosTime-${COSTIME_VSN}
COSTRANSACTIONS=cosTransactions-${COSTRANSACTIONS_VSN}
# Special maintainer target, scan through vsn.mk files and build 'ERL_VERSIONS'
# list
gen-versions: extract
@find ${WRKSRC} -name 'vsn.mk' -exec awk '/_VSN +=/ { print $$1"\t"$$3 " \\" }' {} \; | grep -v 'PRE_' | grep -v 'APP_' | sed 's/DOCB_VSN/DOCBUILDER_VSN/'
@find ${WRKSRC} -name 'vsn.mk' -exec awk -F'=' '/_VSN=/ { print $$1"\t"$$2 " \\" }' {} \; | grep -v 'PRE_' | grep -v 'APP_'
@grep VSN ${WRKSRC}/erts/vsn.mk |awk '/^VSN/ { print "ERTS_VSN\t" $$3 }'
@find ${WRKSRC} -name 'vsn.mk' -exec awk '/_VSN +=/ { print $$1"\t"$$3 " \\" }' {} \; | grep -v 'PRE_' | grep -v 'APP_' | sed 's/DOCB_VSN/DOCBUILDER_VSN/' | sort
@find ${WRKSRC} -name 'vsn.mk' -exec awk -F'=' '/_VSN=/ { print $$1"\t"$$2 " \\" }' {} \; | grep -v 'PRE_' | grep -v 'APP_' | sort
@grep VSN ${WRKSRC}/erts/vsn.mk |awk '/^VSN/ { print "ERTS_VSN\t" $$3 }' | sort

105
lang/erlang/erlang.port.mk
View File

@ -1,4 +1,4 @@
# $OpenBSD: erlang.port.mk,v 1.12 2015/06/23 07:38:53 jasper Exp $
# $OpenBSD: erlang.port.mk,v 1.13 2015/06/23 20:51:57 jasper Exp $
#
# Module for Erlang-based ports or modules
@ -6,7 +6,73 @@ CATEGORIES += lang/erlang
USE_GMAKE ?= Yes
SUBST_VARS += VERSION
# If no configure style is set, then assume "rebar"
.if ${CONFIGURE_STYLE} == ""
CONFIGURE_STYLE = rebar
MODERL_BUILD_DEPENDS += devel/rebar
REBAR_BIN ?= ${LOCALBASE}/bin/rebar
.endif
# Default Erlang version to use if MODERL_VERSION is not set.
# XXX: Keep in sync with devel/rebar/Makefile
MODERL_DEFAULT_VERSION =16
# If the port already has flavors, append ours to it unless the port requires
# a specific version of Erlang.
.if !defined(MODERL_VERSION) && !defined(FLAVORS)
FLAVORS ?= erlang17
.else
FLAVORS += erlang17
.endif
FLAVOR?= # empty
# When no flavor is explicitly set, assume MODERL_DEFAULT_VERSION
.if ${FLAVOR:Merlang17}
MODERL_VERSION = 17
_MODERL_FLAVOR = ${FLAVOR}
.else
MODERL_VERSION ?= ${MODERL_DEFAULT_VERSION}
_MODERL_FLAVOR ?= # empty
.endif
.if ${MODERL_VERSION} == 16
_MODERL_FLAVOR = erlang16
DPB_PROPERTIES += tag:erlang16
.elif ${MODERL_VERSION} == 17
_MODERL_FLAVOR = erlang17
DPB_PROPERTIES += tag:erlang17
.else
ERRORS += "Invalid MODERL_VERSION set: ${MODERL_VERSION}."
.endif
# Append the flavor to all the Erlang dependencies
.for b in ${MODERL_BUILD_DEPENDS}
_MODERL_BDEPS += ${b},${_MODERL_FLAVOR}
.endfor
.for r in ${MODERL_RUN_DEPENDS}
_MODERL_RDEPS += ${r},${_MODERL_FLAVOR}
.endfor
.for t in ${MODERL_TEST_DEPENDS}
_MODERL_TDEPS += ${t},${_MODERL_FLAVOR}
.endfor
MODERL_BUILDDEP ?= Yes
MODERL_RUNDEP ?= Yes
.if ${MODERL_BUILDDEP:L} == yes
BUILD_DEPENDS += ${_MODERL_BDEPS} \
lang/erlang/${MODERL_VERSION}
.endif
.if ${MODERL_RUNDEP:L} == yes
RUN_DEPENDS += ${_MODERL_RDEPS} \
lang/erlang/${MODERL_VERSION}
.endif
TEST_DEPENDS += ${_MODERL_TDEPS}
# Root directory of all Erlang libraries.
ERL_LIBROOT ?= ${PREFIX}/lib/erlang/lib/
@ -14,14 +80,16 @@ ERL_LIBROOT ?= ${PREFIX}/lib/erlang/lib/
# Standard directory into which a module/library gets installed.
ERL_LIBDIR ?= ${ERL_LIBROOT}${DISTNAME}
MODERL_RUN_DEPENDS += lang/erlang/16
# If no configure style is set, then assume "rebar"
.if ${CONFIGURE_STYLE} == ""
CONFIGURE_STYLE = rebar
MODERL_BUILD_DEPENDS += devel/rebar
REBAR_BIN ?= ${LOCALBASE}/bin/rebar
# Some modules don't have a 'version' set and try to retrieve this through git.
# Patch the .app.src files to have ${VERSION} and set ERL_APP_SUBST=Yes.
.if defined(ERL_APP_SUBST) && ${ERL_APP_SUBST:L} == "yes"
.if ! target(pre-configure)
pre-configure:
cd ${WRKSRC}/src/ && ${SUBST_CMD} *.app.src
.endif
.endif
.if ${CONFIGURE_STYLE:L} == "rebar"
# Some modules bundle their own rebar escript, force them to use the system
# rebar instead.
# While here, remove the deps{} block from rebar.config, we cannot download
@ -34,23 +102,6 @@ pre-build:
. endif
.endif
.if defined(MODERL_BUILD_DEPENDS)
BUILD_DEPENDS += ${MODERL_BUILD_DEPENDS}
.endif
.if defined(MODERL_RUN_DEPENDS)
RUN_DEPENDS += ${MODERL_RUN_DEPENDS}
.endif
# Some modules don't have a 'version' set and try to retrieve this through git.
# Patch the .app.src files to have ${VERSION} and set ERL_APP_SUBST=Yes.
.if defined(ERL_APP_SUBST) && ${ERL_APP_SUBST:L} == "yes"
.if ! target(pre-configure)
pre-configure:
cd ${WRKSRC}/src/ && ${SUBST_CMD} *.app.src
.endif
.endif
# Regression test handing:
# If nothing is explicitly set, then MODERL_TEST=Yes and default
# target 'test' is used. Otherwise, if MODERL_TEST=eunit, then
@ -71,3 +122,5 @@ pre-configure:
dialyzer:
cd ${WRKSRC} && ${REBAR_BIN} dialyzer
.endif
SUBST_VARS += VERSION