diff --git a/extra/erlang/.SRCINFO b/extra/erlang/.SRCINFO index 7f2cd2d9b..3ec5d5eb7 100644 --- a/extra/erlang/.SRCINFO +++ b/extra/erlang/.SRCINFO @@ -1,5 +1,5 @@ pkgbase = erlang - pkgver = 27.0 + pkgver = 27.0.1 pkgrel = 1 url = https://erlang.org arch = x86_64 @@ -18,12 +18,12 @@ pkgbase = erlang source = epmd.service source = epmd.socket source = https://github.com/erlang/otp/releases/download/OTP-27.0/otp_doc_man_27.0.tar.gz - source = git+https://github.com/erlang/otp#commit=601a012837ea0a5c8095bf24223132824177124d + source = git+https://github.com/erlang/otp#commit=ee9628e7ed09ef02e767994a6da5b7a225316aaa b2sums = 1675ac9bf948ab19e8b63077d870ccf356fcdbce14de2777f00b3488aa1ce34a5e0a5cdc0428707f744dee5940b12653a44e0ded0554de95ebb31bce4676ff87 b2sums = 1f765318bcd322ce697a48c064ccdb1bd107b4a84e164a87f62678391cb82a9ab17a397d679cf266e037a5a2d91772b85f7a97f9cc5478c0f18118743b30045f b2sums = c37706f5f6e2d49100104fb442ebf15edd6ee0a1e8038d0364794cf34fd3f02a61b9ad2706228b3327b85b0cadcd11aac6087e7c98408eae2d307a09191b6553 b2sums = b55614bc3c795813eb2d73dc990f740efc8408a3639d98569adb9718ee140eb04ac2289ca3cd764d2610ac2138dfd6173b50bcae58b3971b51f4819cc33420e3 - b2sums = c6c913b7b75feb2cec23404914bffbf016d8dbb9ec652874250e2aef930d75d62d6b1746beb7238a505e52f3aa98479d486825c41b9b4ac04437066d9e103a1f + b2sums = 99300d27abe6fc6a5c1ace5315569b4abf17913488aafa7937fcc57138cc44cf7d0e28f6590b0e97c4018d55aa00aae84295aa4f1161ef036f47b6edb5113510 pkgname = erlang pkgdesc = General-purpose concurrent functional programming language developed by Ericsson diff --git a/extra/erlang/PKGBUILD b/extra/erlang/PKGBUILD index aeba8a128..5212158c8 100644 --- a/extra/erlang/PKGBUILD +++ b/extra/erlang/PKGBUILD @@ -10,10 +10,11 @@ # - configure with --disable-pgo to fix ARM FTBFS pkgname=erlang -pkgver=27.0 +pkgver=27.0.1 +_docver=27.0 pkgrel=1 # https://github.com/erlang/otp/tags -_commit=601a012837ea0a5c8095bf24223132824177124d # OTP-27.0 +_commit=ee9628e7ed09ef02e767994a6da5b7a225316aaa # OTP-27.0.1 arch=(x86_64) url='https://erlang.org' license=(Apache) @@ -22,19 +23,19 @@ options=(staticlibs) source=(epmd.conf epmd.service epmd.socket - "https://github.com/erlang/otp/releases/download/OTP-$pkgver/otp_doc_man_$pkgver.tar.gz" + "https://github.com/erlang/otp/releases/download/OTP-$_docver/otp_doc_man_$_docver.tar.gz" "git+https://github.com/erlang/otp#commit=$_commit") b2sums=('1675ac9bf948ab19e8b63077d870ccf356fcdbce14de2777f00b3488aa1ce34a5e0a5cdc0428707f744dee5940b12653a44e0ded0554de95ebb31bce4676ff87' '1f765318bcd322ce697a48c064ccdb1bd107b4a84e164a87f62678391cb82a9ab17a397d679cf266e037a5a2d91772b85f7a97f9cc5478c0f18118743b30045f' 'c37706f5f6e2d49100104fb442ebf15edd6ee0a1e8038d0364794cf34fd3f02a61b9ad2706228b3327b85b0cadcd11aac6087e7c98408eae2d307a09191b6553' 'b55614bc3c795813eb2d73dc990f740efc8408a3639d98569adb9718ee140eb04ac2289ca3cd764d2610ac2138dfd6173b50bcae58b3971b51f4819cc33420e3' - 'c6c913b7b75feb2cec23404914bffbf016d8dbb9ec652874250e2aef930d75d62d6b1746beb7238a505e52f3aa98479d486825c41b9b4ac04437066d9e103a1f') + '99300d27abe6fc6a5c1ace5315569b4abf17913488aafa7937fcc57138cc44cf7d0e28f6590b0e97c4018d55aa00aae84295aa4f1161ef036f47b6edb5113510') prepare() { - # adjust how LDFLAGS are handled + # Adjust how LDFLAGS are handled sed -i 's/^LDFLAGS = /LDFLAGS += /g' otp/lib/megaco/src/flex/Makefile.in - # let the Java bindings support version 11 or later, ref https://gitlab.archlinux.org/archlinux/packaging/packages/erlang/-/issues/1 + # Let the Java bindings support version 11 or later, ref https://gitlab.archlinux.org/archlinux/packaging/packages/erlang/-/issues/1 sed -i 's/^JAVA_OPTIONS =/JAVA_OPTIONS = --release 11/g' otp/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile } @@ -66,17 +67,12 @@ package_erlang() { export PATH="$srcdir/bin:$PATH" make -C otp DESTDIR="$pkgdir" DOC_TARGETS=chunks install install-docs - # services and configuration install -Dm644 epmd.service "$pkgdir/usr/lib/systemd/system/epmd.service" install -Dm644 epmd.socket "$pkgdir/usr/lib/systemd/system/epmd.socket" install -Dm644 epmd.conf "$pkgdir/etc/conf.d/epmd" - # readme and licenses - install -Dm644 otp/README.md "$pkgdir/usr/share/doc/$pkgname/README.md" - install -Dm644 otp/LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE" - install -Dm644 otp/CONTRIBUTING.md "$pkgdir/usr/share/doc/$pkgname/CONTRIBUTING.md" - install -Dm644 otp/AUTHORS "$pkgdir/usr/share/doc/$pkgname/AUTHORS" + cp -r man "$pkgdir/usr/lib/erlang/" - # man pages - cp -r -v man "$pkgdir/usr/lib/erlang/" + install -Dm644 -t "$pkgdir/usr/share/doc/$pkgname" otp/{AUTHORS,CONTRIBUTING.md,README.md} + install -Dm644 otp/LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE" }