commit: 5524070a08e62c6dc6c038788aa0c64bb08ed88b parent b1a80aca3b0130983acbc872aa6f3dea6b8ec066 Author: Haelwenn (lanodan) Monnier <contact@hacktivis.me> Date: Thu, 15 Feb 2024 20:18:39 +0100 dev-lang/erlang: treecleanDiffstat:
| D | dev-lang/erlang/Manifest | 3 | --- |
| D | dev-lang/erlang/erlang-26.0.1.ebuild | 174 | ------------------------------------------------------------------------------- |
| D | dev-lang/erlang/files/50erlang-gentoo.el | 5 | ----- |
| D | dev-lang/erlang/files/epmd.confd-r2 | 2 | -- |
| D | dev-lang/erlang/files/epmd.init-r2 | 23 | ----------------------- |
| D | dev-lang/erlang/files/epmd.init-r3 | 23 | ----------------------- |
| D | dev-lang/erlang/files/epmd.service | 9 | --------- |
| D | dev-lang/erlang/files/epmd.service-r1 | 11 | ----------- |
| D | dev-lang/erlang/files/erlang-22.0-dont-ignore-LDFLAGS.patch | 27 | --------------------------- |
| D | dev-lang/erlang/files/erlang-24.0.2-serial-configure.patch | 12 | ------------ |
| D | dev-lang/erlang/files/erlang-25.1.2-c99.patch | 101 | ------------------------------------------------------------------------------- |
11 files changed, 0 insertions(+), 390 deletions(-)diff --git a/dev-lang/erlang/Manifest b/dev-lang/erlang/Manifest@@ -1,3 +0,0 @@ -DIST erlang-26.0.1.tar.gz 61373350 BLAKE2B 093bb0e983b9ce1be39c203625e9afab7e8f09cd33d4402136361c9c1e52cced8580171d23502e5fdf85fb695a92aed3e071a0f12ea5f4732d8f346be4bc589c SHA512 d4fcfa6dede0f655fbed12ea795af44863f29b6e5a7a537d06c7a97d49c533eeb280e21fb6c9034c6e08c01a87bf036ea83dfd586f442461e6842ebf530feb2b -DIST erlang_doc_html_26.0.tar.gz 37434137 BLAKE2B 0a1bd0f4966d90cc5aaa8852b280204d81271af0449a019399dfcbeab4b2427a91fa57e1dafe24c55ee1a7abf5f52c019ca7454f7c2ca8dbe604d60ef437a4e0 SHA512 c11cf064808bee3a9e8334ee597daadfff397bd700622c80affa8df127a53de3cb5685c3338fa6d28b5c7a5c171379e0289f557dc3fc6ab0459ada757219ce3e -DIST erlang_doc_man_26.0.tar.gz 1742307 BLAKE2B cd52b6e148fd45a1a1b427fa9dccdb7127082f0cfc23a850c519a9dc9e6cc7e0fca3894433d44dcad27e2a8123626b09d86b7f581e503d977f0977ef62a574d8 SHA512 9e3fc06667e633fd1c90f57d86159cbbdbb6105719e3c1ab6733e5190aa48b8c8fbf735172e5763b6893e89a56ec13c0afcdf6c6505de739312b37ff246ed113diff --git a/dev-lang/erlang/erlang-26.0.1.ebuild b/dev-lang/erlang/erlang-26.0.1.ebuild@@ -1,174 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -WX_GTK_VER="3.0-gtk3" - -inherit elisp-common flag-o-matic java-pkg-opt-2 systemd toolchain-funcs wxwidgets - -# NOTE: If you need symlinks for binaries please tell maintainers or -# open up a bug to let it be created. - -UPSTREAM_V="$(ver_cut 1-2)" - -DESCRIPTION="Erlang programming language, runtime environment and libraries (OTP)" -HOMEPAGE="https://www.erlang.org/" -SRC_URI="https://github.com/erlang/otp/archive/OTP-${PV}.tar.gz -> ${P}.tar.gz - https://github.com/erlang/otp/releases/download/OTP-${UPSTREAM_V}/otp_doc_man_${UPSTREAM_V}.tar.gz -> ${PN}_doc_man_${UPSTREAM_V}.tar.gz - doc? ( https://github.com/erlang/otp/releases/download/OTP-${UPSTREAM_V}/otp_doc_html_${UPSTREAM_V}.tar.gz -> ${PN}_doc_html_${UPSTREAM_V}.tar.gz )" - -LICENSE="Apache-2.0" -# We use this subslot because Compiled HiPE Code can be loaded on the exact -# same build of ERTS that was used when compiling the code. See -# http://erlang.org/doc/system_principles/misc.html for more information. -SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="doc emacs java +kpoll odbc sctp ssl systemd tk wxwidgets" - -RDEPEND=" - acct-group/epmd - acct-user/epmd - sys-libs/ncurses:0 - sys-libs/zlib - emacs? ( >=app-editors/emacs-23.1:* ) - java? ( >=virtual/jdk-1.8:* ) - odbc? ( dev-db/unixODBC ) - sctp? ( net-misc/lksctp-tools ) - ssl? ( >=dev-libs/openssl-0.9.7d:0= ) - systemd? ( sys-apps/systemd ) - wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] ) -" -DEPEND="${RDEPEND} - dev-lang/perl -" - -S="${WORKDIR}/otp-OTP-${PV}" - -PATCHES=( - "${FILESDIR}"/${PN}-22.0-dont-ignore-LDFLAGS.patch - "${FILESDIR}"/${PN}-24.0.2-serial-configure.patch - "${FILESDIR}"/${PN}-25.1.2-c99.patch # Bug #882887 -) - -SITEFILE=50"${PN}"-gentoo.el - -src_prepare() { - default - - tc-export AR CPP CXX LD - - # bug #797886: erlang's VM does unsafe casts for ints - # to pointers and back. This breaks on gcc-11 -flto. - append-flags -fno-strict-aliasing -} - -src_configure() { - use wxwidgets && setup-wxwidgets - - local myconf=( - --disable-builtin-zlib - - # don't search for static zlib - --with-ssl-zlib=no - - $(use_enable kpoll kernel-poll) - $(use_with java javac) - $(use_enable sctp) - $(use_with ssl ssl) - $(use_enable ssl dynamic-ssl-lib) - $(use_enable systemd) - $(usex wxwidgets "--with-wx-config=${WX_CONFIG}" "--with-wxdir=/dev/null") - ) - econf "${myconf[@]}" -} - -src_compile() { - emake - - if use doc ; then - emake docs DOC_TARGETS=chunks - fi - - if use emacs ; then - pushd lib/tools/emacs &>/dev/null || die - elisp-compile *.el - popd &>/dev/null || die - fi -} - -extract_version() { - local path="$1" - local var_name="$2" - sed -n -e "/^${var_name} = \(.*\)$/s::\1:p" "${S}/${path}/vsn.mk" || die "extract_version() failed" -} - -src_install() { - local erl_libdir_rel="$(get_libdir)/erlang" - local erl_libdir="/usr/${erl_libdir_rel}" - local erl_interface_ver="$(extract_version lib/erl_interface EI_VSN)" - local erl_erts_ver="$(extract_version erts VSN)" - local my_manpath="/usr/share/${PN}/man" - - [[ -z "${erl_erts_ver}" ]] && die "Couldn't determine erts version" - [[ -z "${erl_interface_ver}" ]] && die "Couldn't determine interface version" - - emake INSTALL_PREFIX="${D}" install - - if use doc ; then - emake INSTALL_PREFIX="${D}" install-docs DOC_TARGETS=chunks - - # Note: we explicitly install docs into: - # /usr/share/doc/${PF}/{doc,lib,erts-*} - # To maintain that layout we gather everything in 'html-docs'. - # See bug #684376. - mkdir html-docs || die - mv "${WORKDIR}"/doc "${WORKDIR}"/lib "${WORKDIR}"/erts-* html-docs/ || die - local DOCS=( "AUTHORS" "HOWTO"/* "README.md" "CONTRIBUTING.md" html-docs/. ) - docompress -x /usr/share/doc/${PF} - else - local DOCS=("README.md") - fi - - einstalldocs - - dosym "../${erl_libdir_rel}/bin/erl" /usr/bin/erl - dosym "../${erl_libdir_rel}/bin/erlc" /usr/bin/erlc - dosym "../${erl_libdir_rel}/bin/escript" /usr/bin/escript - dosym "../${erl_libdir_rel}/lib/erl_interface-${erl_interface_ver}/bin/erl_call" /usr/bin/erl_call - dosym "../${erl_libdir_rel}/erts-${erl_erts_ver}/bin/beam.smp" /usr/bin/beam.smp - - ## Clean up the no longer needed files - rm "${ED}/${erl_libdir}/Install" || die - - insinto "${my_manpath}" - doins -r "${WORKDIR}"/man/* - # extend MANPATH, so the normal man command can find it - # see bug 189639 - newenvd - "90erlang" <<-_EOF_ - MANPATH="${my_manpath}" - _EOF_ - - if use emacs ; then - elisp-install erlang lib/tools/emacs/*.{el,elc} - sed -e "s:/usr/share:${EPREFIX}/usr/share:g" \ - "${FILESDIR}/${SITEFILE}" > "${T}/${SITEFILE}" || die - elisp-site-file-install "${T}/${SITEFILE}" - fi - - newinitd "${FILESDIR}"/epmd.init-r3 epmd - use systemd && systemd_newunit "${FILESDIR}"/epmd.service-r1 epmd.service -} - -src_test() { - # Only run a subset of tests to test that everything was built - # successfully, otherwise we will be here for a long time. - emake kernel_test ARGS="-suite os_SUITE" -} - -pkg_postinst() { - use emacs && elisp-site-regen -} - -pkg_postrm() { - use emacs && elisp-site-regen -}diff --git a/dev-lang/erlang/files/50erlang-gentoo.el b/dev-lang/erlang/files/50erlang-gentoo.el@@ -1,5 +0,0 @@ -;;; erlang site-lisp configuration - -(add-to-list 'load-path "@SITELISP@") -(require 'erlang-start) -(setq erlang-root-dir "/usr/share")diff --git a/dev-lang/erlang/files/epmd.confd-r2 b/dev-lang/erlang/files/epmd.confd-r2@@ -1,2 +0,0 @@ -#arguments for run erlang -command_args="-address 127.0.0.1"diff --git a/dev-lang/erlang/files/epmd.init-r2 b/dev-lang/erlang/files/epmd.init-r2@@ -1,23 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the Erlang Public License 1.1 - -name="Erlang Port Mapper Daemon" - -command="/usr/bin/epmd" -command_user="epmd" -command_group="epmd" - -command_background=yes -pidfile="/var/run/epmd.pid" - -depend() { - need loopback - before sshd -} - -stop() { - ebegin "Stopping ${name}" - ${command} -kill >/dev/null - eend $? -}diff --git a/dev-lang/erlang/files/epmd.init-r3 b/dev-lang/erlang/files/epmd.init-r3@@ -1,23 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the Erlang Public License 1.1 - -name="Erlang Port Mapper Daemon" - -command="/usr/bin/epmd" -command_user="epmd" -command_group="epmd" - -command_background=yes -pidfile="/var/run/epmd.pid" - -depend() { - use net - before sshd -} - -stop() { - ebegin "Stopping ${name}" - ${command} -kill >/dev/null - eend $? -}diff --git a/dev-lang/erlang/files/epmd.service b/dev-lang/erlang/files/epmd.service@@ -1,9 +0,0 @@ -[Unit] -Description=Erlang Portmapper Daemon -Wants=network.target - -[Service] -ExecStart=/usr/bin/epmd - -[Install] -WantedBy=multi-user.targetdiff --git a/dev-lang/erlang/files/epmd.service-r1 b/dev-lang/erlang/files/epmd.service-r1@@ -1,11 +0,0 @@ -[Unit] -Description=Erlang Portmapper Daemon -Wants=network.target - -[Service] -ExecStart=/usr/bin/epmd -User=epmd -Group=epmd - -[Install] -WantedBy=multi-user.targetdiff --git a/dev-lang/erlang/files/erlang-22.0-dont-ignore-LDFLAGS.patch b/dev-lang/erlang/files/erlang-22.0-dont-ignore-LDFLAGS.patch@@ -1,27 +0,0 @@ -This is a forward port of erlang-20.3.2-dont-ignore-LDFLAGS.patch -Anthony G. Basile <blueness@gentoo.org> - -diff -Naur otp-OTP-22.0.orig/lib/megaco/src/flex/Makefile.in otp-OTP-22.0/lib/megaco/src/flex/Makefile.in ---- otp-OTP-22.0.orig/lib/megaco/src/flex/Makefile.in 2019-05-10 12:42:49.000000000 +0000 -+++ otp-OTP-22.0/lib/megaco/src/flex/Makefile.in 2019-06-04 15:53:37.899372564 +0000 -@@ -47,7 +47,7 @@ - CC = @DED_CC@ - CFLAGS_MT = $(CFLAGS) @DED_THR_DEFS@ - LD = @DED_LD@ --LDFLAGS = @DED_LDFLAGS@ -+LDFLAGS += @DED_LDFLAGS@ - LEX = @LEX@ - LEXLIB = @LEXLIB@ - PERL = @PERL@ -diff -Naur otp-OTP-22.0.orig/lib/odbc/c_src/Makefile.in otp-OTP-22.0/lib/odbc/c_src/Makefile.in ---- otp-OTP-22.0.orig/lib/odbc/c_src/Makefile.in 2019-05-10 12:42:49.000000000 +0000 -+++ otp-OTP-22.0/lib/odbc/c_src/Makefile.in 2019-06-04 15:53:37.900372572 +0000 -@@ -82,7 +82,7 @@ - CFLAGS = $(TYPEFLAGS) @CFLAGS@ @THR_DEFS@ @DEFS@ - EI_LDFLAGS = -L$(EI_ROOT)/obj$(TYPEMARKER)/$(TARGET) - LD = @LD@ --LDFLAGS = $(ODBC_LIB) $(EI_LDFLAGS) -+LDFLAGS += $(ODBC_LIB) $(EI_LDFLAGS) - LIBS = @LIBS@ @THR_LIBS@ $(EI_LIB) - INCLUDES = -I. $(ODBC_INCLUDE) $(EI_INCLUDE) - TARGET_FLAGS = @TARGET_FLAGS@diff --git a/dev-lang/erlang/files/erlang-24.0.2-serial-configure.patch b/dev-lang/erlang/files/erlang-24.0.2-serial-configure.patch@@ -1,12 +0,0 @@ -https://bugs.gentoo.org/790563 ---- a/configure -+++ b/configure -@@ -355,7 +355,7 @@ for app_dir in $app_dirs; do - echo "" - elif test $app_dir != erts; then - echo $cmd_str >./configure.result.command -- eval $cmd_str 1>./configure.result.stdout 2>./configure.result.stderr || echo "fatal" > "./configure.result.failed" & -+ eval $cmd_str 1>./configure.result.stdout 2>./configure.result.stderr || echo "fatal" > "./configure.result.failed" - else - # ERTS configure gets to use stdout/stderr; the others are printed when done... - echo "=== Running configure in $ERL_TOP/erts ==="diff --git a/dev-lang/erlang/files/erlang-25.1.2-c99.patch b/dev-lang/erlang/files/erlang-25.1.2-c99.patch@@ -1,101 +0,0 @@ -Bug: https://bugs.gentoo.org/882887 -From: https://github.com/erlang/otp/pull/6504 -From: Florian Weimer <fweimer@redhat.com> -Date: Thu, 24 Nov 2022 11:57:49 +0100 -Subject: [PATCH 1/2] configure.ac: C99 fix for - ERTS___AFTER_MORECORE_HOOK_CAN_TRACK_MALLOC - -#include <unistd.h> for the sbrk function if the header is available. ---- a/erts/configure -+++ b/erts/configure -@@ -20752,6 +20752,9 @@ else $as_nop - #ifdef HAVE_MALLOC_H - # include <malloc.h> - #endif -+#ifdef HAVE_UNISTD_H -+# include <unistd.h> -+#endif - #if defined(HAVE_END_SYMBOL) - extern char end; - #elif defined(HAVE__END_SYMBOL) ---- a/erts/configure.ac -+++ b/erts/configure.ac -@@ -2436,6 +2436,9 @@ AC_CACHE_CHECK([if __after_morecore_hook can track malloc()s core memory use], - #ifdef HAVE_MALLOC_H - # include <malloc.h> - #endif -+#ifdef HAVE_UNISTD_H -+# include <unistd.h> -+#endif - #if defined(HAVE_END_SYMBOL) - extern char end; - #elif defined(HAVE__END_SYMBOL) - -From 7b720d2bb9e742110ff90ec2495747b2c477e2c7 Mon Sep 17 00:00:00 2001 -From: Florian Weimer <fweimer@redhat.com> -Date: Thu, 24 Nov 2022 11:59:22 +0100 -Subject: [PATCH 2/2] configure.ac: C99 fixes for poll_works check - -Include <fcntl.h> if it is available for the open prototype. -Return from main instead of calling exit, so that no function -declaration is needed. ---- a/erts/configure -+++ b/erts/configure -@@ -24663,10 +24663,13 @@ else $as_nop - /* end confdefs.h. */ - - #include <poll.h> --main() -+#ifdef HAVE_FCNTL_H -+#include <fcntl.h> -+#endif -+int main() - { - #ifdef _POLL_EMUL_H_ -- exit(1); /* Implemented using select() -- fail */ -+ return 1; /* Implemented using select() -- fail */ - #else - struct pollfd fds[1]; - int fd; -@@ -24675,9 +24678,9 @@ main() - fds[0].events = POLLIN; - fds[0].revents = 0; - if (poll(fds, 1, 0) < 0 || (fds[0].revents & POLLNVAL) != 0) { -- exit(1); /* Does not work for devices -- fail */ -+ return 1; /* Does not work for devices -- fail */ - } -- exit(0); -+ return 0; - #endif - } - ---- a/erts/configure.ac -+++ b/erts/configure.ac -@@ -3036,10 +3036,13 @@ poll_works=no - - AC_RUN_IFELSE([AC_LANG_SOURCE([[ - #include <poll.h> --main() -+#ifdef HAVE_FCNTL_H -+#include <fcntl.h> -+#endif -+int main() - { - #ifdef _POLL_EMUL_H_ -- exit(1); /* Implemented using select() -- fail */ -+ return 1; /* Implemented using select() -- fail */ - #else - struct pollfd fds[1]; - int fd; -@@ -3048,9 +3051,9 @@ main() - fds[0].events = POLLIN; - fds[0].revents = 0; - if (poll(fds, 1, 0) < 0 || (fds[0].revents & POLLNVAL) != 0) { -- exit(1); /* Does not work for devices -- fail */ -+ return 1; /* Does not work for devices -- fail */ - } -- exit(0); -+ return 0; - #endif - } - ]])],[poll_works=yes],[poll_works=no],[