Skip to content

Commit

Permalink
update erlang to 23.2.5 and ejabberd to 21.01
Browse files Browse the repository at this point in the history
  • Loading branch information
@hgy59
hgy59 committed Feb 16, 2021
1 parent 35ea640 commit b68f420
Show file tree
Hide file tree
Showing 9 changed files with 584 additions and 578 deletions.
2 changes: 1 addition & 1 deletion cross/ejabberd/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PKG_NAME = ejabberd
PKG_VERS = 20.12
PKG_VERS = 21.01
PKG_EXT = tgz
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
PKG_DIST_SITE = https://static.process-one.net/ejabberd/downloads/$(PKG_VERS)
Expand Down
1,087 changes: 545 additions & 542 deletions cross/ejabberd/PLIST
View file

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions cross/ejabberd/digests
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
ejabberd-20.12.tgz SHA1 33851f33a68ce7dd45a28d4f63b40f7cbb8c9dbc
ejabberd-20.12.tgz SHA256 9d9c5d617472bf851e8cf2c7353fe9e82aef5b6d8aa28eeb6528bde8a463a854
ejabberd-20.12.tgz MD5 564ffd03050a7786bd3b0fa4b761ba19
ejabberd-21.01.tgz SHA1 162889e275746b021da71d3a001bd4405632efc0
ejabberd-21.01.tgz SHA256 f1526138061b079054e4842ed50d520f0ada7dda3deb19c9e2beccbbeeee4086
ejabberd-21.01.tgz MD5 efe98c7d1808aafd335f81fb151b2998
7 changes: 3 additions & 4 deletions cross/erlang/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PKG_NAME = erlang
PKG_VERS = 22.3.4.13
PKG_VERS = 23.2.5
PKG_EXT = tar.gz
PKG_DIST_NAME = OTP-$(PKG_VERS).$(PKG_EXT)
PKG_DIST_SITE = https://www.erlang.org/download/
Expand All @@ -20,21 +20,20 @@ GNU_CONFIGURE = 1
PRE_CONFIGURE_TARGET = erlang_pre_configure
INSTALL_TARGET = erlang_install

CONFIGURE_ARGS = --without-javac
CONFIGURE_ARGS = --without-javac
CONFIGURE_ARGS += --without-jinterface
CONFIGURE_ARGS += --without-odbc
CONFIGURE_ARGS += --enable-dynamic-ssl-lib
CONFIGURE_ARGS += --with-ssl=$(STAGING_INSTALL_PREFIX)
CONFIGURE_ARGS += erl_xcomp_sysroot=$(INSTALL_DIR)
CONFIGURE_ARGS += CFLAGS="-O2 -g -D_GNU_SOURCE"

include ../../mk/spksrc.cross-cc.mk

.PHONY: erlang_pre_configure
erlang_pre_configure:
$(RUN) ./otp_build autoconf

include ../../mk/spksrc.cross-cc.mk

.PHONY: erlang_install
erlang_install:
$(RUN) make install DESTDIR=$(INSTALL_DIR) INSTALL_PREFIX=
41 changes: 22 additions & 19 deletions cross/erlang/PLIST
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ bin:lib/erlang/bin/ct_run
bin:lib/erlang/bin/dialyzer
lnk:lib/erlang/bin/epmd
rsc:lib/erlang/bin/erl
bin:lib/erlang/bin/erl_call
bin:lib/erlang/bin/erlc
bin:lib/erlang/bin/escript
rsc:lib/erlang/bin/no_dot_erlang.boot
Expand All @@ -24,23 +25,25 @@ rsc:lib/erlang/bin/start_erl
rsc:lib/erlang/bin/start_sasl.boot
bin:lib/erlang/bin/to_erl
bin:lib/erlang/bin/typer
bin:lib/erlang/erts-10.7.2.6/bin/beam.smp
bin:lib/erlang/erts-10.7.2.6/bin/ct_run
bin:lib/erlang/erts-10.7.2.6/bin/dialyzer
bin:lib/erlang/erts-10.7.2.6/bin/dyn_erl
bin:lib/erlang/erts-10.7.2.6/bin/epmd
rsc:lib/erlang/erts-10.7.2.6/bin/erl
rsc:lib/erlang/erts-10.7.2.6/bin/erl.src
bin:lib/erlang/erts-10.7.2.6/bin/erl_child_setup
bin:lib/erlang/erts-10.7.2.6/bin/erlc
bin:lib/erlang/erts-10.7.2.6/bin/erlexec
bin:lib/erlang/erts-10.7.2.6/bin/escript
bin:lib/erlang/erts-10.7.2.6/bin/heart
bin:lib/erlang/erts-10.7.2.6/bin/inet_gethost
bin:lib/erlang/erts-10.7.2.6/bin/run_erl
rsc:lib/erlang/erts-10.7.2.6/bin/start
rsc:lib/erlang/erts-10.7.2.6/bin/start.src
rsc:lib/erlang/erts-10.7.2.6/bin/start_erl.src
bin:lib/erlang/erts-10.7.2.6/bin/to_erl
bin:lib/erlang/erts-10.7.2.6/bin/typer
bin:lib/erlang/erts-11.1.8/bin/beam.smp
bin:lib/erlang/erts-11.1.8/bin/ct_run
bin:lib/erlang/erts-11.1.8/bin/dialyzer
bin:lib/erlang/erts-11.1.8/bin/dyn_erl
bin:lib/erlang/erts-11.1.8/bin/epmd
rsc:lib/erlang/erts-11.1.8/bin/erl
rsc:lib/erlang/erts-11.1.8/bin/erl.src
bin:lib/erlang/erts-11.1.8/bin/erl_call
bin:lib/erlang/erts-11.1.8/bin/erl_child_setup
bin:lib/erlang/erts-11.1.8/bin/erlc
bin:lib/erlang/erts-11.1.8/bin/erlexec
bin:lib/erlang/erts-11.1.8/bin/escript
bin:lib/erlang/erts-11.1.8/bin/heart
bin:lib/erlang/erts-11.1.8/bin/inet_gethost
bin:lib/erlang/erts-11.1.8/bin/run_erl
rsc:lib/erlang/erts-11.1.8/bin/start
rsc:lib/erlang/erts-11.1.8/bin/start.src
rsc:lib/erlang/erts-11.1.8/bin/start_erl.src
bin:lib/erlang/erts-11.1.8/bin/to_erl
bin:lib/erlang/erts-11.1.8/bin/typer
bin:lib/erlang/erts-11.1.8/bin/yielding_c_fun
rsc:lib/erlang/lib/
6 changes: 3 additions & 3 deletions cross/erlang/digests
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
erlang-OTP-22.3.4.13.tar.gz SHA1 a155b366ee637537af94d3ad95f2bae22bb7163d
erlang-OTP-22.3.4.13.tar.gz SHA256 0da6f7702301d237f82514898f5ec8669412a60fc3b8ea6ce2c168bec1edf7fb
erlang-OTP-22.3.4.13.tar.gz MD5 598bf13135cd2678eef0368cb3818273
erlang-OTP-23.2.5.tar.gz SHA1 8eeee8c644bf93569805ccd63d0000381451036d
erlang-OTP-23.2.5.tar.gz SHA256 00587a60bc97a26060265b201f69dd7059ddd04506f6502e8e78c5f00e1b1db7
erlang-OTP-23.2.5.tar.gz MD5 5c729542666563325a740abe31a5d32a
5 changes: 3 additions & 2 deletions native/erlang/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PKG_NAME = erlang
PKG_VERS = 22.3.4.13
PKG_VERS = 23.2.5
PKG_EXT = tar.gz
PKG_DIST_NAME = OTP-$(PKG_VERS).$(PKG_EXT)
PKG_DIST_SITE = https://github.com/erlang/otp/archive
Expand All @@ -17,11 +17,12 @@ CONFIGURE_TARGET = erlang_configure
COMPILE_TARGET = erlang_compile
INSTALL_TARGET = erlang_install

CONFIGURE_ARGS += -without-javac
CONFIGURE_ARGS = --without-javac
CONFIGURE_ARGS += --without-jinterface
CONFIGURE_ARGS += --without-odbc
CONFIGURE_ARGS += --enable-dynamic-ssl-lib
CONFIGURE_ARGS += --prefix=$(INSTALL_DIR)$(INSTALL_PREFIX)
CONFIGURE_ARGS += CFLAGS="-O2 -g -D_GNU_SOURCE"

include ../../mk/spksrc.native-cc.mk

Expand Down
6 changes: 3 additions & 3 deletions native/erlang/digests
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
erlang-OTP-22.3.4.13.tar.gz SHA1 a155b366ee637537af94d3ad95f2bae22bb7163d
erlang-OTP-22.3.4.13.tar.gz SHA256 0da6f7702301d237f82514898f5ec8669412a60fc3b8ea6ce2c168bec1edf7fb
erlang-OTP-22.3.4.13.tar.gz MD5 598bf13135cd2678eef0368cb3818273
erlang-OTP-23.2.5.tar.gz SHA1 8eeee8c644bf93569805ccd63d0000381451036d
erlang-OTP-23.2.5.tar.gz SHA256 00587a60bc97a26060265b201f69dd7059ddd04506f6502e8e78c5f00e1b1db7
erlang-OTP-23.2.5.tar.gz MD5 5c729542666563325a740abe31a5d32a
2 changes: 1 addition & 1 deletion spk/ejabberd/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
SPK_NAME = ejabberd
SPK_VERS = 20.12
SPK_VERS = 21.01
SPK_REV = 2
SPK_ICON = src/ejabberd.png
DSM_UI_DIR = app
Expand Down

0 comments on commit b68f420

Please sign in to comment.