diff options
Diffstat (limited to 'dev-lang/erlang')
| -rw-r--r-- | dev-lang/erlang/Manifest | 2 | ||||
| -rw-r--r-- | dev-lang/erlang/erlang-26.0.ebuild | 17 |
2 files changed, 10 insertions, 9 deletions
diff --git a/dev-lang/erlang/Manifest b/dev-lang/erlang/Manifest index 500c7bd1ae8e..da8cedd58c13 100644 --- a/dev-lang/erlang/Manifest +++ b/dev-lang/erlang/Manifest @@ -14,5 +14,5 @@ DIST erlang_doc_html_26.0.tar.gz 37434137 BLAKE2B 0a1bd0f4966d90cc5aaa8852b28020 DIST erlang_doc_man_25.3.tar.gz 1719335 BLAKE2B d3d91e5920648ddb5b8375c969586b904d743f1d60acbefddd98577bd11b82246a2f149fdaa8ff1d16e8efc9f3793ce1dbc61efc9bc28c68f50919460d1e8e24 SHA512 9f2e6c4e4a39dd41deb6a2d7b7a04dd374f110bf776c8d08f3139265a8fa00e7c9420e2d2c406231a8d2748bdc65ca7e40ef1d4b9bfe6b06f52a24881ee8747d DIST erlang_doc_man_26.0.tar.gz 1742307 BLAKE2B cd52b6e148fd45a1a1b427fa9dccdb7127082f0cfc23a850c519a9dc9e6cc7e0fca3894433d44dcad27e2a8123626b09d86b7f581e503d977f0977ef62a574d8 SHA512 9e3fc06667e633fd1c90f57d86159cbbdbb6105719e3c1ab6733e5190aa48b8c8fbf735172e5763b6893e89a56ec13c0afcdf6c6505de739312b37ff246ed113 EBUILD erlang-25.3.ebuild 5093 BLAKE2B ac5a0bdbe5247fcf32cdc88db5ee0af5b6496d67e752b70bcf8a28be8d57086eaa42f4e5705f11bf37a8ae3e3ada0262292b987df75c858b86c5ed8f5a257539 SHA512 5fff2f7d103024388e7c3231380bc4ad04d00ea68eab4abfca0df7f037789dc65463c8ede3d181d55aaa6bac4add07a98f9303ccfca5eb778e9ebfeb3ba690b4 -EBUILD erlang-26.0.ebuild 5391 BLAKE2B fbce0248371a6d7143e65bf945f9c9d5d469cbf1569adba696cf3becc7aca207c5c3040f1a1a3686fa14b6966faa1588783a8adb912f3f353bd504a89b34e429 SHA512 fe09e18e4b3c41a775cc0a1d4f0580e58c8e1859d6e75c7bfc52ea9c0c2a52a5f54ed971b484e163a712f29fe78cbb4861965f1aecafbf37fc125f54b0a1c7ec +EBUILD erlang-26.0.ebuild 5404 BLAKE2B e5522bf371a23396377123815d226d6a496373ff8f8b58a36a945557cf1a77db9f015538fa621f015cfa9e9458d13c785060a13cafa805f3b2b96d3e5cea69d5 SHA512 6232d71a0e106615347e65b63f17e6fbbe3ad2f0b6563c272d2c046193cfb535a3360eb5bad02438f0c9d3e1206ab89ee41845b259b96b8e6a9fc5e735b931c7 MISC metadata.xml 749 BLAKE2B 32f06b2fa8579a65cdf259a76df093da6e8d5c27497f8167d8288947076a11960606ad23567bb4984d6b24270965dbd7563b8c9ae08f8f69a8968ac102f32a8e SHA512 4dc1b01adfab93b5ea99876cbd7a4a9a39e66f6417b7e84a9341dab91f3d63fa903b69e4d827a656a709d4308f32ee0bd4a9594b87b3d3d05543249c847ca3c0 diff --git a/dev-lang/erlang/erlang-26.0.ebuild b/dev-lang/erlang/erlang-26.0.ebuild index 60e753d858e2..fbbddf9a48d0 100644 --- a/dev-lang/erlang/erlang-26.0.ebuild +++ b/dev-lang/erlang/erlang-26.0.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. @@ -38,15 +38,8 @@ RDEPEND=" systemd? ( sys-apps/systemd ) wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] ) " - -# libei.so (from dev-libs/libei) conflicts with libei.a from -# erl_interface. Causes build faiure. Erlang build system needs to be -# patched to prefer its own libei instead of system libei. Installed -# into /usr/lib/erlang so no conflict following installation. Bug -# #912888. DEPEND="${RDEPEND} dev-lang/perl - !!dev-libs/libei " S="${WORKDIR}/otp-OTP-${PV}" @@ -67,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() { |