--- a/components/erlang/Makefile Fri Apr 18 15:16:34 2014 +0200
+++ b/components/erlang/Makefile Fri Apr 18 06:34:38 2014 -0700
@@ -20,40 +20,42 @@
#
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
#
include ../../make-rules/shared-macros.mk
PATH=$(SPRO_VROOT)/bin:$(JAVA_HOME)/bin:/usr/bin
-COMPONENT_NAME= otp_src
-COMPONENT_VERSION_MAJOR= 12
+COMPONENT_NAME= erlang
+COMPONENT_VERSION_MAJOR= 15
COMPONENT_VERSION_MINOR= B
-COMPONENT_VERSION_MICRO= 5
+COMPONENT_VERSION_MICRO= 03
# IPS_COMPONENT_VERSION needs update whenever this is changed
-COMPONENT_VERSION= R$(COMPONENT_VERSION_MAJOR)$(COMPONENT_VERSION_MINOR)-$(COMPONENT_VERSION_MICRO)
+COMPONENT_VERSION= R$(COMPONENT_VERSION_MAJOR)$(COMPONENT_VERSION_MINOR)$(COMPONENT_VERSION_MICRO)
COMPONENT_PROJECT_URL= http://www.erlang.org/
-COMPONENT_SRC= $(COMPONENT_NAME)_$(COMPONENT_VERSION)
-COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz
+COMPONENT_SRC_NAME= otp_src
+COMPONENT_SRC= $(COMPONENT_SRC_NAME)_$(COMPONENT_VERSION)
+COMPONENT_ARCHIVE= $(COMPONENT_SRC)-1.tar.gz
COMPONENT_ARCHIVE_HASH= \
- sha256:6ec3f344dd626bd83494fcad66db98a03f930a039b2a1499313d1a5a57aadda7
+ sha256:4bccac86dd76aec050252e44276a0283a0df9218e6470cf042a9b9f9dfc9476c
COMPONENT_ARCHIVE_URL= $(COMPONENT_PROJECT_URL)download/$(COMPONENT_ARCHIVE)
+COMPONENT_BUGDB= utility/erlang
# manpages
COMPONENT_NAME_1= otp_doc_man
COMPONENT_SRC_1= $(COMPONENT_NAME_1)_$(COMPONENT_VERSION)
-COMPONENT_ARCHIVE_1= $(COMPONENT_SRC_1).tar.gz
+COMPONENT_ARCHIVE_1= $(COMPONENT_SRC_1)-1.tar.gz
COMPONENT_ARCHIVE_HASH_1= \
- sha256:f7acb458b72ffa8f9b1f45501bed85d3d9fb691c601f3f6997856c501e2f0659
+ sha256:07980d8014c7cf8194b7078c137353f5083992add4663ced3dcba2ff91f228d8
COMPONENT_ARCHIVE_URL_1= $(COMPONENT_PROJECT_URL)download/$(COMPONENT_ARCHIVE_1)
# HTML documentation
COMPONENT_NAME_2= otp_doc_html
COMPONENT_SRC_2= $(COMPONENT_NAME_2)_$(COMPONENT_VERSION)
-COMPONENT_ARCHIVE_2= $(COMPONENT_SRC_2).tar.gz
+COMPONENT_ARCHIVE_2= $(COMPONENT_SRC_2)-1.tar.gz
COMPONENT_ARCHIVE_HASH_2= \
- sha256:db131a347217ab434ca4c483abb61dc01989e0db43e1fe6982c3067f60cf91d7
+ sha256:d06f580f11d1303217a5c1cf8d68a98d7e01c535be934dcd430ecdc254f7572e
COMPONENT_ARCHIVE_URL_2= $(COMPONENT_PROJECT_URL)download/$(COMPONENT_ARCHIVE_2)
include ../../make-rules/prep.mk
@@ -62,24 +64,33 @@
# IPS_COMPONENT_VERSION is by default set to $(COMPONENT_VERSION) but it is not
# enough for us. We need to include the $(COMPONENT_SUBVERSION) somehow.
-# Because the IPS_COMPONENT_VERSION cannot contain letters we use mapping:
-# R(major)(minor)-(micro) - (major).(minor as number).(micro)
-IPS_COMPONENT_VERSION= $(COMPONENT_VERSION_MAJOR).2.$(COMPONENT_VERSION_MICRO)
+# Because the IPS_COMPONENT_VERSION cannot contain letters or leading zeroes
+# we use mapping:
+# R(major)(minor)(micro) - (major).(minor as number).(micro)
+IPS_COMPONENT_VERSION= $(COMPONENT_VERSION_MAJOR).2.3
# Built in SFW with gcc and builds cleanly now only with gcc
-COMPILER = gcc
+COMPILER = gcc
CONFIGURE_OPTIONS += CFLAGS="$(CFLAGS)"
CONFIGURE_OPTIONS += CPPFLAGS="$(CPPFLAGS) -I/usr/include/gd2"
CONFIGURE_OPTIONS += --enable-smp-support
CONFIGURE_OPTIONS += --enable-threads
+# The HiPE portion is a bit sensitive, and only seems to work 64-bit on
+# amd64 (thus the variant.arch tagging in erlang.p5m). erts/config.log
+# can be very interesting if issues occur.
CONFIGURE_OPTIONS += --enable-hipe
CONFIGURE_OPTIONS += --with-ssl
CONFIGURE_OPTIONS += --enable-dynamic-ssl-lib
+CONFIGURE_BINDIR.64 = $(CONFIGURE_PREFIX)/bin
+
CONFIGURE_OPTIONS.64 += LDFLAGS="$(LDFLAGS) -m64"
CONFIGURE_OPTIONS.64 += LIBS="-m64"
+# Needed for 'set name=info.source-url' action in erlang-doc.p5m
+PKG_MACROS += COMPONENT_ARCHIVE_URL_2=$(COMPONENT_ARCHIVE_URL_2)
+
# Use cp(1) instead of cloney because erlang's 'install' target uses 'tar'
# to copy files and our tar doesn't handle long links by default. Between
# the use of 'tar' and 'ld', a path adjustment wasn't an option due to the
@@ -91,10 +102,13 @@
COMPONENT_INSTALL_ARGS += INSTALL_PREFIX=$(PROTO_DIR)
+COMPONENT_TEST_ENV += ERL_TOP=$(BUILD_DIR_64)
+COMPONENT_TEST_TARGETS = tests
+
# common targets
-build: $(BUILD_32_and_64)
+build: $(BUILD_64)
-install: $(INSTALL_32_and_64)
+install: $(INSTALL_64)
# Undelivered useless files:
# erlang/lib/crypto-*/priv/obj
# erlang/lib/ssl-*/priv/obj
@@ -107,15 +121,14 @@
$(UNPACK) $(UNPACK_ARGS) ../$(COMPONENT_ARCHIVE_1) && \
$(UNPACK) $(UNPACK_ARGS) ../$(COMPONENT_ARCHIVE_2)
# remove INSTALL_PREFIX from path
- $(PERL) -pi -e "s|$(PROTO_DIR)||g" $(PROTO_DIR)/usr/lib/erlang/bin/erl \
+ $(PERL) -pi -e "s|$(PROTO_DIR)||g" \
$(PROTO_DIR)/usr/lib/$(MACH64)/erlang/bin/erl \
- $(PROTO_DIR)/usr/lib/erlang/releases/RELEASES \
$(PROTO_DIR)/usr/lib/$(MACH64)/erlang/releases/RELEASES
clean::
$(RM) -r documentation
-test: $(NO_TESTS)
+test: $(TEST_64)
BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS)