Browse Source

Merge pull request #6204 from cretingame/master

erlang: update to version 19.3, add packages
lilik-openwrt-22.03
Hannu Nyman 6 years ago
committed by GitHub
parent
commit
05bf36f734
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 109 additions and 51 deletions
  1. +109
    -18
      lang/erlang/Makefile
  2. +0
    -11
      lang/erlang/patches/101-emulator_includes.patch
  3. +0
    -11
      lang/erlang/patches/102-musl_compat.patch
  4. +0
    -11
      lang/erlang/patches/103-disable_emacs.patch

+ 109
- 18
lang/erlang/Makefile View File

@ -8,17 +8,17 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=erlang
PKG_VERSION:=17.5
PKG_RELEASE:=3
PKG_VERSION:=19.3
PKG_RELEASE:=6
PKG_SOURCE:=otp_src_$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:= http://www.erlang.org/download/ \
http://erlang.mirror.su.se/
PKG_HASH:=3c28820c981b30c50df8ac2a4a238e5813454fa3ed2ad530bc7948a282846474
PKG_SOURCE_URL:= http://www.erlang.org/download/
PKG_HASH:=fe4a00651db39b8542b04530a48d24b2f2e7e0b77cbe93d728c9f05325bdfe83
PKG_LICENSE:=ErlPL-1.1
PKG_LICENSE_FILES:=EPLICENCE
PKG_MAINTAINER:=Nicolas Thill <nico@openwrt.org>
PKG_MAINTAINER:=Nicolas Thill <nico@openwrt.org> \
Arnaud Sautaux <arnaud.sautaux@infoteam.ch>
PKG_BUILD_DEPENDS:=erlang/host openssl
PKG_USE_MIPS16:=0
@ -46,7 +46,7 @@ endef
define Package/erlang
$(call Package/erlang/Default)
DEPENDS+= +libncurses +librt +zlib
PROVIDES:= erlang-erts=6.4 erlang-kernel=3.2 erlang-sasl=2.4.1 erlang-stdlib=2.4
PROVIDES:= erlang-erts=8.3 erlang-kernel=5.2 erlang-sasl=3.0.3 erlang-stdlib=3.3
endef
define Package/erlang/description
@ -60,7 +60,7 @@ endef
define Package/erlang-asn1
$(call Package/erlang/Default)
TITLE:=Abstract Syntax Notation One (ASN.1) support
VERSION:=3.0.4
VERSION:=4.0.4
DEPENDS+= +erlang +erlang-syntax-tools
endef
@ -75,7 +75,7 @@ endef
define Package/erlang-compiler
$(call Package/erlang/Default)
TITLE:=Byte code compiler
VERSION:=5.0.4
VERSION:=7.0.4
DEPENDS+= +erlang +erlang-hipe
endef
@ -90,7 +90,7 @@ endef
define Package/erlang-crypto
$(call Package/erlang/Default)
TITLE:=Cryptography support
VERSION:=3.5
VERSION:=3.7.3
DEPENDS+= +erlang +libopenssl
endef
@ -105,7 +105,7 @@ endef
define Package/erlang-hipe
$(call Package/erlang/Default)
TITLE:=High Performance Erlang
VERSION:=3.11.3
VERSION:=3.15.4
DEPENDS+= +erlang
endef
@ -120,7 +120,7 @@ endef
define Package/erlang-inets
$(call Package/erlang/Default)
TITLE:=Internet clients and servers
VERSION:=5.10.6
VERSION:=6.3.6
DEPENDS+= +erlang
endef
@ -136,7 +136,7 @@ endef
define Package/erlang-mnesia
$(call Package/erlang/Default)
TITLE:=Distributed database
VERSION:=4.12.5
VERSION:=4.14.3
DEPENDS+= +erlang
endef
@ -153,7 +153,7 @@ endef
define Package/erlang-runtime-tools
$(call Package/erlang/Default)
TITLE:=Low-profile debugging/tracing tools
VERSION:=1.8.16
VERSION:=1.11.1
DEPENDS+= +erlang
endef
@ -168,7 +168,7 @@ endef
define Package/erlang-snmp
$(call Package/erlang/Default)
TITLE:=Simple Network Management Protocol (SNMP) support
VERSION:=5.1.1
VERSION:=5.2.5
DEPENDS+= +erlang +erlang-asn1
endef
@ -181,10 +181,24 @@ $(call Package/erlang/Default/description)
endef
define Package/erlang-public-key
$(call Package/erlang/Default)
TITLE:=Public Key support
VERSION:=1.4
DEPENDS+= +erlang +erlang-crypto +erlang-asn1
endef
define Package/erlang-public-key/description
$(call Package/erlang/Default/description)
.
This Erlang/OTP package provides functions to handle public-key infrastructure.
endef
define Package/erlang-ssh
$(call Package/erlang/Default)
TITLE:=Secure Shell (SSH) support
VERSION:=3.2
VERSION:=4.4.1
DEPENDS+= +erlang +erlang-crypto
endef
@ -199,7 +213,7 @@ endef
define Package/erlang-ssl
$(call Package/erlang/Default)
TITLE:=Secure Sockets Layer (SSL) support
VERSION:=6.0
VERSION:=8.1.1
DEPENDS+= +erlang +erlang-crypto
endef
@ -214,7 +228,7 @@ endef
define Package/erlang-syntax-tools
$(call Package/erlang/Default)
TITLE:=Abstract Erlang syntax trees handling support
VERSION:=1.6.18
VERSION:=2.1.1
DEPENDS+= +erlang
endef
@ -226,6 +240,76 @@ $(call Package/erlang/Default/description)
endef
define Package/erlang-tools
$(call Package/erlang/Default)
TITLE:=Erlang tools support
VERSION:=2.9.1
DEPENDS+= +erlang
endef
define Package/erlang-tools/description
$(call Package/erlang/Default/description)
.
This Erlang/OTP package provides support for misc tools.
endef
define Package/erlang-reltool
$(call Package/erlang/Default)
TITLE:=Erlang reltool support
VERSION:=0.7.3
DEPENDS+= +erlang
endef
define Package/erlang-reltool/description
$(call Package/erlang/Default/description)
.
This Erlang/OTP package provides support for release management.
endef
define Package/erlang-erl-interface
$(call Package/erlang/Default)
TITLE:=Erlang erl_interface support
VERSION:=3.9.3
DEPENDS+= +erlang
endef
define Package/erlang-erl-interface/description
$(call Package/erlang/Default/description)
.
This Erlang/OTP package provides support for erlang interoperability with other languages.
endef
define Package/erlang-os_mon
$(call Package/erlang/Default)
TITLE:=Erlang OS Monitoring Application
VERSION:=2.4.2
DEPENDS+= +erlang
endef
define Package/erlang-os_mon/description
$(call Package/erlang/Default/description)
.
This Erlang/OTP package provides the following services:
cpu_sup CPU load and utilization supervision
disksup Disk supervision
memsup Memory supervision
endef
define Package/erlang-xmerl
$(call Package/erlang/Default)
TITLE:=Erlang XML export
VERSION:=1.3.13
DEPENDS+= +erlang
endef
define Package/erlang-xmerl/description
$(call Package/erlang/Default/description)
.
This Erlang/OTP package provides functions for exporting XML data to an external format
endef
# Host
HOST_CONFIGURE_ARGS += \
@ -334,6 +418,13 @@ $(eval $(call BuildModule,inets,inets))
$(eval $(call BuildModule,mnesia,mnesia))
$(eval $(call BuildModule,runtime-tools,runtime_tools))
$(eval $(call BuildModule,snmp,snmp))
$(eval $(call BuildModule,public-key,public_key))
$(eval $(call BuildModule,ssh,ssh))
$(eval $(call BuildModule,ssl,ssl))
$(eval $(call BuildModule,syntax-tools,syntax_tools))
$(eval $(call BuildModule,tools,tools))
$(eval $(call BuildModule,reltool,reltool))
$(eval $(call BuildModule,erl-interface,erl_interface))
$(eval $(call BuildModule,os_mon,os_mon))
$(eval $(call BuildModule,xmerl,xmerl))

+ 0
- 11
lang/erlang/patches/101-emulator_includes.patch View File

@ -1,11 +0,0 @@
--- a/erts/emulator/Makefile.in
+++ b/erts/emulator/Makefile.in
@@ -682,7 +682,7 @@ $(OBJDIR)/beam_emu.o: beam/beam_emu.c
endif
$(OBJDIR)/%.o: beam/%.c
- $(V_CC) $(subst -O2, $(GEN_OPT_FLGS), $(CFLAGS)) $(INCLUDES) -c $< -o $@
+ $(V_CC) $(INCLUDES) $(subst -O2, $(GEN_OPT_FLGS), $(CFLAGS)) -c $< -o $@
$(OBJDIR)/%.o: $(TARGET)/%.c
$(V_CC) $(CFLAGS) $(INCLUDES) -Idrivers/common -c $< -o $@

+ 0
- 11
lang/erlang/patches/102-musl_compat.patch View File

@ -1,11 +0,0 @@
--- a/lib/erl_interface/src/connect/ei_resolve.c
+++ b/lib/erl_interface/src/connect/ei_resolve.c
@@ -642,7 +642,7 @@ struct hostent *ei_gethostbyname_r(const
#ifndef HAVE_GETHOSTBYNAME_R
return my_gethostbyname_r(name,hostp,buffer,buflen,h_errnop);
#else
-#if (defined(__GLIBC__) || (__FreeBSD_version >= 602000) || defined(__DragonFly__) || defined(__ANDROID__))
+#if (defined(_GNU_SOURCE) || (__FreeBSD_version >= 602000) || defined(__DragonFly__) || defined(__ANDROID__))
struct hostent *result;
gethostbyname_r(name, hostp, buffer, buflen, &result, h_errnop);

+ 0
- 11
lang/erlang/patches/103-disable_emacs.patch View File

@ -1,11 +0,0 @@
--- a/lib/tools/Makefile
+++ b/lib/tools/Makefile
@@ -23,7 +23,7 @@ include $(ERL_TOP)/make/$(TARGET)/otp.mk
# Macros
# ----------------------------------------------------
-SUB_DIRECTORIES = c_src src doc/src examples priv emacs
+SUB_DIRECTORIES = c_src src doc/src examples priv
include vsn.mk
VSN = $(TOOLS_VSN)

Loading…
Cancel
Save