--- a/components/erlang/Makefile Tue Apr 21 13:54:46 2015 -0700
+++ b/components/erlang/Makefile Tue Apr 21 15:56:35 2015 -0700
@@ -28,37 +28,33 @@
include ../../make-rules/shared-macros.mk
-PATH=$(SPRO_VROOT)/bin:$(JAVA_HOME)/bin:/usr/bin
+PATH=$(JAVA_HOME)/bin:/usr/bin
COMPONENT_NAME= erlang
-COMPONENT_VERSION_MAJOR= 15
-COMPONENT_VERSION_MINOR= B
-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= 17.5
COMPONENT_PROJECT_URL= http://www.erlang.org/
COMPONENT_SRC_NAME= otp_src
COMPONENT_SRC= $(COMPONENT_SRC_NAME)_$(COMPONENT_VERSION)
-COMPONENT_ARCHIVE= $(COMPONENT_SRC)-1.tar.gz
+COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz
COMPONENT_ARCHIVE_HASH= \
- sha256:4bccac86dd76aec050252e44276a0283a0df9218e6470cf042a9b9f9dfc9476c
+ sha256:3c28820c981b30c50df8ac2a4a238e5813454fa3ed2ad530bc7948a282846474
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)-1.tar.gz
+COMPONENT_ARCHIVE_1= $(COMPONENT_SRC_1).tar.gz
COMPONENT_ARCHIVE_HASH_1= \
- sha256:07980d8014c7cf8194b7078c137353f5083992add4663ced3dcba2ff91f228d8
+ sha256:85b1b2a1011fc01af550f1fe9e5a599a4c5f2a35d264d2804af1d05590a857c3
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)-1.tar.gz
+COMPONENT_ARCHIVE_2= $(COMPONENT_SRC_2).tar.gz
COMPONENT_ARCHIVE_HASH_2= \
- sha256:d06f580f11d1303217a5c1cf8d68a98d7e01c535be934dcd430ecdc254f7572e
+ sha256:baba1d373c1faacf4a1a6ec1220d57d0cb2b977edb74f32cd58dc786361c6cf5
COMPONENT_ARCHIVE_URL_2= $(COMPONENT_PROJECT_URL)download/$(COMPONENT_ARCHIVE_2)
TPNO= 18548
@@ -67,20 +63,13 @@
include $(WS_MAKE_RULES)/configure.mk
include $(WS_MAKE_RULES)/ips.mk
-# 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 or leading zeroes
-# we use mapping:
-# R(major)(minor)(micro) - (major).(minor as number).(micro)
-IPS_COMPONENT_VERSION= $(COMPONENT_VERSION_MAJOR).2.3
-
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
+# 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.
+# can be very interesting if issues occur.
CONFIGURE_OPTIONS += --enable-hipe
CONFIGURE_OPTIONS += --with-ssl
CONFIGURE_OPTIONS += --enable-dynamic-ssl-lib
@@ -91,16 +80,19 @@
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)
+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
-# need for /usr/bin/ld and /usr/gnu/bin/tar. Perhaps this can be looked
-# at when we upgrade to a more current version.
+# need for /usr/bin/ld and /usr/gnu/bin/tar. This is still the case with
+# erlang version 17.5.
COMPONENT_PRE_CONFIGURE_ACTION = \
($(CP) -rp $(SOURCE_DIR)/. $(@D))
-CONFIGURE_SCRIPT = $(@D)/configure
+CONFIGURE_SCRIPT = $(@D)/configure
+
+# Always show the build and link lines for easier debugging.
+COMPONENT_BUILD_ARGS += V=1
COMPONENT_INSTALL_ARGS += INSTALL_PREFIX=$(PROTO_DIR)
@@ -114,7 +106,6 @@
ASLR_MODE = $(ASLR_ENABLE)
-# common targets
configure: $(CONFIGURE_64)
build: $(BUILD_64)
@@ -141,11 +132,10 @@
test: $(TEST_64)
-
REQUIRED_PACKAGES += library/ncurses
REQUIRED_PACKAGES += library/security/openssl
+REQUIRED_PACKAGES += library/zlib
REQUIRED_PACKAGES += shell/ksh93
REQUIRED_PACKAGES += system/core-os
REQUIRED_PACKAGES += system/library
REQUIRED_PACKAGES += system/library/math
-REQUIRED_PACKAGES += system/linker