From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1348E158089 for ; Wed, 11 Oct 2023 12:21:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5570E2BC01B; Wed, 11 Oct 2023 12:21:58 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 359432BC01B for ; Wed, 11 Oct 2023 12:21:58 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1085D335C2A for ; Wed, 11 Oct 2023 12:21:57 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6A784992 for ; Wed, 11 Oct 2023 12:21:55 +0000 (UTC) From: "Matthew Smith" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matthew Smith" Message-ID: <1697026909.f8943e7ddc1668226fd2ba1da0b1837c44d558c3.matthew@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/erlang/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lang/erlang/erlang-25.3.ebuild X-VCS-Directories: dev-lang/erlang/ X-VCS-Committer: matthew X-VCS-Committer-Name: Matthew Smith X-VCS-Revision: f8943e7ddc1668226fd2ba1da0b1837c44d558c3 X-VCS-Branch: master Date: Wed, 11 Oct 2023 12:21:55 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: b52bd40c-2f9a-4c79-a0be-f0bca60ef389 X-Archives-Hash: c2dde712967c5d10ca98cb49a60bc680 commit: f8943e7ddc1668226fd2ba1da0b1837c44d558c3 Author: Matthew Smith gentoo org> AuthorDate: Wed Oct 11 12:20:21 2023 +0000 Commit: Matthew Smith gentoo org> CommitDate: Wed Oct 11 12:21:49 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8943e7d dev-lang/erlang: add libei fix to erlang-25.3 Closes: https://bugs.gentoo.org/915566 Signed-off-by: Matthew Smith gentoo.org> dev-lang/erlang/erlang-25.3.ebuild | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dev-lang/erlang/erlang-25.3.ebuild b/dev-lang/erlang/erlang-25.3.ebuild index 71f106edbf6a..554952363897 100644 --- a/dev-lang/erlang/erlang-25.3.ebuild +++ b/dev-lang/erlang/erlang-25.3.ebuild @@ -4,7 +4,7 @@ EAPI=7 WX_GTK_VER="3.0-gtk3" -inherit elisp-common flag-o-matic java-pkg-opt-2 systemd toolchain-funcs wxwidgets +inherit autotools 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. @@ -60,6 +60,14 @@ src_prepare() { # 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 + + # Ensure that we use erl_interface's libei.a, and not the system + # libei.so from dev-libs/libei. Bug #912888. + sed -i 's/-lei$/-l:libei.a/' \ + "${S}"/lib/odbc/c_src/Makefile.in || die + (cd "${S}"/lib/odbc && + eautoconf -B "${S}"/make/autoconf && + eautoheader -B "${S}"/make/autoconf) || die } src_configure() {