diff options
-rw-r--r-- | community/erlang/0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch | 59 | ||||
-rw-r--r-- | community/erlang/0010-fix-nteventlog-remove.patch | 13 | ||||
-rw-r--r-- | community/erlang/APKBUILD | 57 |
3 files changed, 10 insertions, 119 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 deleted file mode 100644 index 73b5b08928f..00000000000 --- a/community/erlang/0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch +++ /dev/null @@ -1,59 +0,0 @@ -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..2c9d395cdc 100644 ---- a/lib/os_mon/doc/src/Makefile -+++ b/lib/os_mon/doc/src/Makefile -@@ -36,11 +36,16 @@ RELSYSDIR = $(RELEASE_PATH)/lib/$(APPLICATION)-$(VSN) - # Target Specs - # ---------------------------------------------------- - XML_APPLICATION_FILES = ref_man.xml -+ifeq ($(findstring win32,$(TARGET)),win32) -+ NTEVENTLOG_DOCFILE=nteventlog.xml -+else -+ NTEVENTLOG_DOCFILE= -+endif - XML_REF3_FILES = cpu_sup.xml \ - disksup.xml \ - memsup.xml \ - os_sup.xml \ -- nteventlog.xml -+ $(NTEVENTLOG_DOCFILE) - - XML_REF6_FILES = os_mon_app.xml - -diff --git a/lib/os_mon/src/Makefile b/lib/os_mon/src/Makefile -index 923a31f290..3d0edf1ef9 100644 ---- a/lib/os_mon/src/Makefile -+++ b/lib/os_mon/src/Makefile -@@ -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_sup os_mon_sysinfo $(NTEVENTLOG) - - INCLUDE=../include - CSRC=../c_src -@@ -78,7 +83,11 @@ docs: - # ---------------------------------------------------- - - $(APP_TARGET): $(APP_SRC) ../vsn.mk -+ifeq ($(findstring win32,$(TARGET)),win32) - $(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@ -+else -+ $(vsn_verbose)sed -e 's;%VSN%;$(VSN);;s;,\s*nteventlog;;' $< > $@ -+endif - - $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk - $(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@ diff --git a/community/erlang/0010-fix-nteventlog-remove.patch b/community/erlang/0010-fix-nteventlog-remove.patch deleted file mode 100644 index 6a4e8729da9..00000000000 --- a/community/erlang/0010-fix-nteventlog-remove.patch +++ /dev/null @@ -1,13 +0,0 @@ -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_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, - os_sup_server]}, - {applications, [kernel, stdlib, sasl]}, diff --git a/community/erlang/APKBUILD b/community/erlang/APKBUILD index 97385bc5609..784bb1a8eda 100644 --- a/community/erlang/APKBUILD +++ b/community/erlang/APKBUILD @@ -3,58 +3,25 @@ # Contributor: Marlus Saraiva <marlus.saraiva@gmail.com> # Maintainer: Daniel Isaksen <d@duniel.no> pkgname=erlang -pkgver=22.2.7 +pkgver=23.0 pkgrel=0 pkgdesc="General-purpose programming language and runtime environment" url="https://www.erlang.org/" license="Apache-2.0" arch="all !mips !mips64" -depends="$pkgname-kernel $pkgname-stdlib $pkgname-compiler" makedepends="perl-dev perl zlib-dev ncurses-dev openssl-dev openjdk8 unixodbc-dev autoconf wxgtk-dev glu-dev" subpackages="$pkgname-dev - $pkgname-asn1:_mv_erlang_lib - $pkgname-common-test:_mv_erlang_lib - $pkgname-compiler:_mv_erlang_lib - $pkgname-crypto:_mv_erlang_lib $pkgname-debugger:_mv_erlang_lib $pkgname-dialyzer:_mv_erlang_lib - $pkgname-diameter:_mv_erlang_lib - $pkgname-edoc:_mv_erlang_lib - $pkgname-eldap:_mv_erlang_lib - $pkgname-erl-docgen:_mv_erlang_lib - $pkgname-erl-interface:_mv_erlang_lib - $pkgname-erts:_mv_erlang_lib $pkgname-et:_mv_erlang_lib - $pkgname-eunit:_mv_erlang_lib - $pkgname-ftp:_mv_erlang_lib - $pkgname-hipe:_mv_erlang_lib - $pkgname-inets:_mv_erlang_lib - $pkgname-jinterface:_mv_erlang_lib - $pkgname-kernel:_mv_erlang_lib $pkgname-megaco:_mv_erlang_lib - $pkgname-mnesia:_mv_erlang_lib $pkgname-observer:_mv_erlang_lib $pkgname-odbc:_mv_erlang_lib - $pkgname-os-mon:_mv_erlang_lib - $pkgname-parsetools:_mv_erlang_lib - $pkgname-public-key:_mv_erlang_lib $pkgname-reltool:_mv_erlang_lib - $pkgname-runtime-tools:_mv_erlang_lib - $pkgname-sasl:_mv_erlang_lib - $pkgname-snmp:_mv_erlang_lib - $pkgname-ssh:_mv_erlang_lib - $pkgname-ssl:_mv_erlang_lib - $pkgname-stdlib:_mv_erlang_lib - $pkgname-syntax-tools:_mv_erlang_lib - $pkgname-tftp:_mv_erlang_lib - $pkgname-tools:_mv_erlang_lib $pkgname-wx:_mv_erlang_lib - $pkgname-xmerl:_mv_erlang_lib " -source="https://github.com/erlang/otp/archive/OTP-$pkgver.tar.gz - 0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch - 0010-fix-nteventlog-remove.patch" +source="https://github.com/erlang/otp/archive/OTP-$pkgver.tar.gz" builddir="$srcdir/otp-OTP-$pkgver" @@ -86,16 +53,14 @@ package() { _mv_erlang_lib() { local lib=$(echo ${subpkgname#$pkgname-} | tr '-' '_') + depends="$pkgname=$pkgver-r$pkgrel" case "$lib" in - asn1) depends="$depends $pkgname-crypto";; - common_test) depends="$depends $pkgname-xmerl";; - compiler) depends="$depends $pkgname-syntax-tools $pkgname-parsetools $pkgname-erl-interface";; - eunit) depends="$depends $pkgname-common-test";; - public_key) depends="$depends $pkgname-asn1";; - sasl) depends="$depends $pkgname-inets";; - snmp) depends="$depends $pkgname-inets";; - ssh) depends="$depends $pkgname-public-key $pkgname-inets";; - ssl) depends="$depends $pkgname-public-key $pkgname-inets";; + debugger) depends="$pkgname-wx=$pkgver-$pkgrel";; + dialyzer) depends="$pkgname-wx=$pkgver-$pkgrel";; + et) depends="$pkgname-wx=$pkgver-$pkgrel";; + megaco) depends="$pkgname-debugger=$pkgver-r$pkgrel $pkgname-et=$pkgver-r$pkgrel";; + observer) depends="$pkgname-et=$pkgver-r$pkgrel $pkgname-wx=$pkgver-$pkgrel";; + reltool) depends="$pkgname-wx=$pkgver-$pkgrel";; esac mkdir -p "$subpkgdir"/usr/lib/erlang/lib @@ -159,6 +124,4 @@ verifydeps() { } -sha512sums="1746acd526eda37c769b70bba1ad0f73ee1e658d05d0cbbe4063f34c11f8061932b2cde04df725537f5c5b81b537897ada2f0f9b6b18b7554b0f7596c492906b OTP-22.2.7.tar.gz -6a711e25b55816527c0a793e45dafb9a95b0a20fa537f8e03fb918e0137f1b1f60e414861a7005b8230a72e3e2f5e0caedb054a6c492b6f6f859ddbad47d2175 0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch -dbbc05908cd4b1a3842ff32afcef8a0621b1ec532e83d70fed4ee9263b3f82afc0d173c7a7c776196c8f54c2ab2bca3c9ce35da676dedd5802dbc23111525577 0010-fix-nteventlog-remove.patch" +sha512sums="e5d1e4b52951234f8bd4f8db7bef59a330d2783aae317468e0b94ad23cd55a60afba5d3841efad49dfcda6d7ba0a51e60208bb6a950951683fd297df56636f83 OTP-23.0.tar.gz" |