This patch is pretty much what it says on the tin.
---
...teventlog-and-related-doc-files-on-n.patch | 25 ++++++++-----------
.../erlang/0010-fix-nteventlog-remove.patch | 4 ++-
community/erlang/APKBUILD | 22 ++++++++--------
3 files changed, 24 insertions(+), 27 deletions(-)
diff --git a/community/erlang/0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch b/community/erlang/0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch
index 05ea1eec89..e409c4fccc 100644
--- a/community/erlang/0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch
+++ b/community/erlang/0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch
@@ -1,13 +1,8 @@
-From: Peter Lemenkov <lemenkov@gmail.com>
-Date: Sat, 19 Jun 2010 09:59:39 +0400
-Subject: [PATCH] Do not install nteventlog and related doc-files on non-win32
- systems
-
-Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
-
+diff --git a/lib/os_mon/doc/src/Makefile b/lib/os_mon/doc/src/Makefile
+index 8e9a4c333c..33b32b09b9 100644
--- a/lib/os_mon/doc/src/Makefile
+++ b/lib/os_mon/doc/src/Makefile
-@@ -36,12 +36,17 @@
+@@ -36,11 +36,16 @@ RELSYSDIR = $(RELEASE_PATH)/lib/$(APPLICATION)-$(VSN)
# Target Specs
# ----------------------------------------------------
XML_APPLICATION_FILES = ref_man.xml
@@ -19,31 +14,31 @@ Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
XML_REF3_FILES = cpu_sup.xml \
disksup.xml \
memsup.xml \
- os_mon_mib.xml \
os_sup.xml \
- nteventlog.xml
+ $(NTEVENTLOG_DOCFILE)
- XML_REF6_FILES = os_mon_app.xml
+ XML_REF6_FILES = os_mon_app.xml
+diff --git a/lib/os_mon/src/Makefile b/lib/os_mon/src/Makefile
+index 923a31f290..fcc6902ad4 100644
--- a/lib/os_mon/src/Makefile
+++ b/lib/os_mon/src/Makefile
-@@ -34,8 +34,13 @@
+@@ -34,7 +34,12 @@ RELSYSDIR = $(RELEASE_PATH)/lib/os_mon-$(VSN)
# ----------------------------------------------------
# Target Specs
# ----------------------------------------------------
+-MODULES= disksup memsup cpu_sup os_mon os_sup os_mon_sysinfo nteventlog
+ifeq ($(findstring win32,$(TARGET)),win32)
+NTEVENTLOG=nteventlog
+else
+NTEVENTLOG=
+endif
- MODULES= disksup memsup cpu_sup os_mon os_mon_mib os_sup os_mon_sysinfo \
-- nteventlog
-+ $(NTEVENTLOG)
++MODULES= disksup memsup cpu_sup os_mon os_sup os_mon_sysinfo $(NTEVENTLOG)
INCLUDE=../include
CSRC=../c_src
-@@ -79,7 +84,11 @@
+@@ -78,7 +83,11 @@ docs:
# ----------------------------------------------------
$(APP_TARGET): $(APP_SRC) ../vsn.mk
diff --git a/community/erlang/0010-fix-nteventlog-remove.patch b/community/erlang/0010-fix-nteventlog-remove.patch
index b981085165..6a4e8729da 100644
--- a/community/erlang/0010-fix-nteventlog-remove.patch
@@ -1,9 +1,11 @@
+diff --git a/lib/os_mon/src/os_mon.app.src b/lib/os_mon/src/os_mon.app.src
+index 6c9b0d7576..4f21264c2e 100644
--- a/lib/os_mon/src/os_mon.app.src
+++ b/lib/os_mon/src/os_mon.app.src
@@ -22,7 +22,7 @@
[{description, "CPO CXC 138 46"},
{vsn, "%VSN%"},
- {modules, [os_mon, os_mon_mib, os_sup,
+ {modules, [os_mon, os_sup,
- disksup, memsup, cpu_sup, os_mon_sysinfo, nteventlog]},
+ disksup, memsup, cpu_sup, os_mon_sysinfo]},
{registered, [os_mon_sup, os_mon_sysinfo, disksup, memsup, cpu_sup,
diff --git a/community/erlang/APKBUILD b/community/erlang/APKBUILD
index 6914b9891b..2db2970742 100644
--- a/community/erlang/APKBUILD
@@ -1,11 +1,11 @@
# Contributor: Michael Mason <ms13sp@gmail.com>
# Contributor: Gabriele Santomaggio <g.santomaggio@gmail.com>
# Contributor: Marlus Saraiva <marlus.saraiva@gmail.com>
-# Maintainer:
+# Maintainer: Daniel Isaksen <d@duniel.no>
pkgname=erlang
-pkgver=21.2.6
+pkgver=22.0
_srcver=$pkgver
-pkgrel=2
+pkgrel=0
pkgdesc="General-purpose programming language and runtime environment"
url="http://www.erlang.org/"
license="Apache-2.0"
@@ -37,7 +37,6 @@ subpackages="$pkgname-dev
$pkgname-observer:observer
$pkgname-odbc:odbc
$pkgname-os-mon:os_mon
- $pkgname-otp-mibs:otp_mibs
$pkgname-parsetools:parsetools
$pkgname-public-key:public_key
$pkgname-reltool:reltool
@@ -48,9 +47,10 @@ subpackages="$pkgname-dev
$pkgname-ssl:ssl
$pkgname-stdlib:stdlib
$pkgname-syntax-tools:syntax_tools
+ $pkgname-tftp:tftp
$pkgname-tools:tools
- $pkgname-xmerl:xmerl
- $pkgname-wx:wx"
+ $pkgname-wx:wx
+ $pkgname-xmerl:xmerl"
options="!check"
source="https://github.com/erlang/otp/archive/OTP-$_srcver.tar.gz
0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch
@@ -127,7 +127,6 @@ observer() { _mv_erlang_lib observer; }
odbc() { _mv_erlang_lib odbc; }
orber() { _mv_erlang_lib orber; }
os_mon() { _mv_erlang_lib os_mon; }
-otp_mibs() { _mv_erlang_lib otp_mibs; }
parsetools() { _mv_erlang_lib parsetools; }
public_key() { _mv_erlang_lib public_key; depends="$depends erlang-asn1"; }
reltool() { _mv_erlang_lib reltool; }
@@ -138,9 +137,10 @@ ssh() { _mv_erlang_lib ssh; depends="$depends erlang-public-key erlang-inets"; }
ssl() { _mv_erlang_lib ssl; depends="$depends erlang-public-key erlang-inets"; }
stdlib() { _mv_erlang_lib stdlib; }
syntax_tools() { _mv_erlang_lib syntax_tools; }
+tftp() { _mv_erlang_lib tftp; depends="$depends erlang-inets"; }
tools() { _mv_erlang_lib tools; }
-xmerl() { _mv_erlang_lib xmerl; }
wx() { _mv_erlang_lib wx; }
+xmerl() { _mv_erlang_lib xmerl; }
dev() {
set -x
@@ -178,7 +178,7 @@ dev() {
}
-sha512sums="0d43a5eb6e9d01e2997b7c82a15b2bd7483a0623f86f8aaff3ec59b5da6aa2cd8135d48cf66233e28c780473f83b90ad56c076374273cefa79b79622e57027f9 OTP-21.2.6.tar.gz
-5d377faccd73382bc86c5aa3182767bc5d1639220c78c2f624135f597f3c823a6871ff13f6f8a109baa8a9ae5d215233b40193e5cfe07af275aa53f327e956de 0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch
-bb4346dabe17115bc310837c5f0aeb367a745d8ba2159495084e599d0419fc57648d144c811306914ac48d0e087d6150a356f38640ba070642b4578acc5fe573 0010-fix-nteventlog-remove.patch
+sha512sums="77236ef940ac3ecbcfaf4d0258d245df3b1411a9f769692fe8ad85ef6ba14bdb27356bf47af885c95889202a35af52e0e24a78e316535fda0db8e19114c807cc OTP-22.0.tar.gz
+cff8813351c6c04ad0e6b3b172705a5ab1efb6811ac381f79f11f09ade0fd49c080d8cece26f8f1eb7faf4851634d6e3c3773d3202582fa622eeab36dc457fc9 0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch
+dbbc05908cd4b1a3842ff32afcef8a0621b1ec532e83d70fed4ee9263b3f82afc0d173c7a7c776196c8f54c2ab2bca3c9ce35da676dedd5802dbc23111525577 0010-fix-nteventlog-remove.patch
dc2fe08e40c73b48b356382c43c982f9f0091e601bbdf6e032358bd5c74c3573b423ef4df454b87c8534105fdbc19ce2245609cc7d5679109c15abaf56d3ef69 safe-signal-handling.patch"
--
2.21.0
---
Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org
Help: alpine-aports+help@lists.alpinelinux.org
---