summaryrefslogtreecommitdiff
path: root/dev-lang/erlang
diff options
context:
space:
mode:
Diffstat (limited to 'dev-lang/erlang')
-rw-r--r--dev-lang/erlang/Manifest9
-rw-r--r--dev-lang/erlang/erlang-25.0.4-r1.ebuild (renamed from dev-lang/erlang/erlang-25.0.4.ebuild)1
-rw-r--r--dev-lang/erlang/erlang-25.1.1-r1.ebuild (renamed from dev-lang/erlang/erlang-25.1.1.ebuild)1
-rw-r--r--dev-lang/erlang/erlang-25.1.2-r1.ebuild (renamed from dev-lang/erlang/erlang-25.1.2.ebuild)1
-rw-r--r--dev-lang/erlang/files/erlang-25.1.2-c99.patch101
-rw-r--r--dev-lang/erlang/metadata.xml3
6 files changed, 112 insertions, 4 deletions
diff --git a/dev-lang/erlang/Manifest b/dev-lang/erlang/Manifest
index 444a916be5c7..eeb30bfcf906 100644
--- a/dev-lang/erlang/Manifest
+++ b/dev-lang/erlang/Manifest
@@ -7,6 +7,7 @@ AUX epmd.service 138 BLAKE2B f56c907ec51bb85c437235334cf01c6a43ccf2316be3b226ab5
AUX epmd.service-r1 159 BLAKE2B ec50e4bfd89dc2d35fc2e549c695f9aae163d3df4d3c7a0d3f85f0f747c13a8aed9c8e9e57f3898ab31aec6795d7cd0565a7c563dc77f3f6154e53be88ec326d SHA512 4b99b2092fe447fa01e3badfce261bca6400ebda70f890efbacc40570019adfe9fc349a6d024955e2f1909c9068f37415b64d0a104399f2696eff6ccf6ad06ab
AUX erlang-22.0-dont-ignore-LDFLAGS.patch 1174 BLAKE2B 64900c6b934ecbd11238e604f907e6f8b1ec2730d2b98aad5405383742563e050bc6ffaae22d55a22998658460109fac9f6628458f5e976e9fbfe71cc26f1d64 SHA512 0fd7cbef64a9a54e0959d49b50096f9abc6fcede4360c153631c7f649f5c41b35ffb1f2d06f80964bf49421464bcc43c96147c227d60cf413c51b3e89ae9ad24
AUX erlang-24.0.2-serial-configure.patch 586 BLAKE2B 3ad4fcbf35310dc11e8aaddca95a467414c60390a7e170c83d0775230a5a815212c6ddce55e98721b02e03511f80e67cfbd60e4b06bc86c615bb3a51d5015ec5 SHA512 abc81ef2a0b23fbe82542efefb1cbb12b1143e9282f7114ea929c18a5c02f2053caabb05ef9838d40b40f3ca59b06955528b122092438ee3d4ef6a8b567fc335
+AUX erlang-25.1.2-c99.patch 2686 BLAKE2B ba1ae0682a4c66efef36ed82b1fb3ab14fdabc0dcfe6e8b9605d20f14c690f476cb8e439693b9e63fa047ff9227caa27bc66481c00f86d6d4104568c5380f496 SHA512 7a5214ae8592000caa7e528e0b967d35e3a7816bef7249238a69e83aa2b475b45633d439a709ffab6053c8f3cf31e6def896e2671f4801d0a55ac49f75135ba6
DIST erlang-24.3.4.2.tar.gz 59532491 BLAKE2B 28c48f1a3197a151010a775286cf0b775567301411b8480b32cfb39c68978de5586b63c245fe58bff8034ebc04fcc3b002dee7c953127ecf581ed6d716587ae4 SHA512 78bc2dc67fe60d3ea6049c361a017c054e12b0adeeae890b0a1ee5301744505593bd19f3731acebff8312b323a3bd21a1359507d122fc34f0eb85eefb3aac88c
DIST erlang-25.0.4.tar.gz 59812650 BLAKE2B cebba32e859ec4ff0868de506771449a6d5d053d50d8f4a2cf84f9bc90da1e14ae320420b3c33f6febd5977fd1ccff98b55d3ee1a0c4b90e674e912883cb0f29 SHA512 8d9d12496d55181c0d866bbd97576551d1d78232fe34b845e8efbfbd4e95ce8426e73221d8126d12453959cd8adc5e07f121aaa93f3a5696074b43c69291d363
DIST erlang-25.1.1.tar.gz 59974226 BLAKE2B f28662860533c8946429607b8123c241d3646c2c0ab2165346512c2a1b331dbaf46d978bce17b8b792a0487ad96411c2245d273381e304437724335a353093dd SHA512 7e34eca772d29132dc907181ee9829ea58a47e622a9a65c0d4f66e79cb2e8f22a9f9e2edefad67ee6c151ee09027ed3927be65228780cdbe606a0abe59209243
@@ -18,7 +19,7 @@ DIST erlang_doc_man_24.3.tar.gz 1680242 BLAKE2B 3311eb6ed6dcaa2d611adf7a08269f67
DIST erlang_doc_man_25.0.tar.gz 1711510 BLAKE2B 743efa8edbeeb99e37e227c1e5e3be1825a391007e1c220ba22163c528edda8941b1dca0951cc02aff016dda0d52f3a6ff4fdbbbe279ce067c7a1993997ce6b4 SHA512 c6b6490961228893253e11d5bb88cbd30ba2cb1c13819a85db6699b437f0327fb55962accb6b602a4ec5ffc423882205d05873b064fb3e4c52950a423706fb09
DIST erlang_doc_man_25.1.tar.gz 1714586 BLAKE2B b37b03f60d662d02018515de5ca16b3891a32c5ebc1bd1cc72ac17aadd409c3c5084898f1605d4a8aa579ebce4b5a8f75a39fa90e5fc4d233b2f7e9b8121768d SHA512 4194779c8975234ad8f693bbe43c9eefd2d954ed7fec493493c4a6a9028b58fd55ce6479a113d863bd91ff4732b88c4b8cae3e3a16846add5c7af6616317f595
EBUILD erlang-24.3.4.2.ebuild 4783 BLAKE2B db44c0614d88101ffc13edb07ca6b2dd7c119b0ddb0c099b18ad37fd751596fbeb5f982712e8cd69e9a2cb000f5d3aded0197d4fab8d512ca4d4d9349a9de4e6 SHA512 e2cc06e3c2e11d874b135a4c2dcc2dcd84592d32964f22a68ce25dd45b7a36143e691c39e350227ce284b5964cb6f00b961c08f30916e540338e5f12801fb7bd
-EBUILD erlang-25.0.4.ebuild 4965 BLAKE2B 5a582c538bccaa9a70b1f379b67a7cd07ddf61c4014fa9a19c6ede4234cf0e4cfd9045693e2d39c2cd5e409f95646575177da8cd59a906d3f6969bd5a42e6d5e SHA512 213f5f374b01277b65ebe650f12ed1fae09eb7064f1729da228c0e47a92127000338b655651bcfca4d5e05bd9d8b9298096ea39456c83dc44e2fa63998f8ed74
-EBUILD erlang-25.1.1.ebuild 4927 BLAKE2B b019c3be9d31d41d227036b88cc1682121d6621fc089e7d3e37ab0ee4a7c9484c5f12b9aaa92e73cc7b2266f294f23572a32c86f76c3dcc4faf7a961bcd96e74 SHA512 33ef16ce6d4a920b403ab6d39946c26fbb0208a26fb2114646cb0074a002ebe9d91f27eadba93d0654e9fd66831ea2d5ee6a0ecde957570176689b774963f2d3
-EBUILD erlang-25.1.2.ebuild 5046 BLAKE2B 99752d01911a866d6cb851acfd2e3cf7e1d159c752a42bb3c10b0608cb474eeb7e874d35b534c17945ae5a44b0ab4aa1ee55d0e3110ef4af67f28cb0460654ec SHA512 f2b8eb3399703bbf519de5015011b2c86f3c8bdfb655d83b08835a38d505028701c2f1bea8894d6bbfbc451b7829d7629bddf6842956d1dcbda6ea7c69b0c672
-MISC metadata.xml 674 BLAKE2B a5ba4a16a6fc7cc3300471f3415c87b5563aca5af2392194401092a6c8a7888ee024526f25cd5ca20c754ced631444e49d51cad001dc4e985ef95a6aacac7164 SHA512 a830c15318fc227627aac8537d42a5ecccebd7e3cf1837d4d13cd10367a0f48d99d08480aff3e1491919dcbb42c29b38aa28b44435d50f1397e6b6aaf6fb053b
+EBUILD erlang-25.0.4-r1.ebuild 5017 BLAKE2B 0c78785a21f4e4e59a2718443f923b5a28bfa624bb4b1d041c7e02619e6f5f9fece80a211a5d3624de17c914732d60860bc87a4284631226b5342a266a465ab9 SHA512 926fa60cad6aa995bd316f60be1e3303793531cd3cd16328142be94ce1c2cd65ba30020febeec9d67a5f249355db122f31e6bc0a687c0a8a61193762b24a8bb1
+EBUILD erlang-25.1.1-r1.ebuild 4979 BLAKE2B 499d8465709c320d2dadb8d353853d3d5c1ce9c9626e500162a2716bbd742ad415e67b58441e95bf990e4eee572fccb833159d9e211cf830a7847b97aa0762cd SHA512 6ccadee9a1644526f67bdb2365ef9c2c17a3ff43260883276545a879e4fa291e21a21149db05e629eae2bcc9a003a109fa73d1c45727d522da577bc042ee5164
+EBUILD erlang-25.1.2-r1.ebuild 5098 BLAKE2B ba49e002eb52e4a899a2e6ceb49c8a7095f825e15a3e1a139cd5ac28c634c09653c5e829920ead5ffbde1b9b316519346a37a8cdaf75788989105f169a932ea1 SHA512 9a24e13b7a23fe6673f05940effe96cbffe4cbc3bc03a94facc3b99ba0e48bb597855fe092d2dc0bcfa520e41fc18098d6db62fbbd84f126d42bd38b3c25186e
+MISC metadata.xml 749 BLAKE2B 32f06b2fa8579a65cdf259a76df093da6e8d5c27497f8167d8288947076a11960606ad23567bb4984d6b24270965dbd7563b8c9ae08f8f69a8968ac102f32a8e SHA512 4dc1b01adfab93b5ea99876cbd7a4a9a39e66f6417b7e84a9341dab91f3d63fa903b69e4d827a656a709d4308f32ee0bd4a9594b87b3d3d05543249c847ca3c0
diff --git a/dev-lang/erlang/erlang-25.0.4.ebuild b/dev-lang/erlang/erlang-25.0.4-r1.ebuild
index cfab5952952b..59e41501cabd 100644
--- a/dev-lang/erlang/erlang-25.0.4.ebuild
+++ b/dev-lang/erlang/erlang-25.0.4-r1.ebuild
@@ -47,6 +47,7 @@ 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
diff --git a/dev-lang/erlang/erlang-25.1.1.ebuild b/dev-lang/erlang/erlang-25.1.1-r1.ebuild
index de9c4088ead3..3b06f87886f2 100644
--- a/dev-lang/erlang/erlang-25.1.1.ebuild
+++ b/dev-lang/erlang/erlang-25.1.1-r1.ebuild
@@ -47,6 +47,7 @@ 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
diff --git a/dev-lang/erlang/erlang-25.1.2.ebuild b/dev-lang/erlang/erlang-25.1.2-r1.ebuild
index ed72f4f42e78..eba295d5cdbc 100644
--- a/dev-lang/erlang/erlang-25.1.2.ebuild
+++ b/dev-lang/erlang/erlang-25.1.2-r1.ebuild
@@ -47,6 +47,7 @@ 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
diff --git a/dev-lang/erlang/files/erlang-25.1.2-c99.patch b/dev-lang/erlang/files/erlang-25.1.2-c99.patch
new file mode 100644
index 000000000000..bc8ffdaace6c
--- /dev/null
+++ b/dev-lang/erlang/files/erlang-25.1.2-c99.patch
@@ -0,0 +1,101 @@
+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],[
diff --git a/dev-lang/erlang/metadata.xml b/dev-lang/erlang/metadata.xml
index 5d7e897a2877..b94b53e5efc3 100644
--- a/dev-lang/erlang/metadata.xml
+++ b/dev-lang/erlang/metadata.xml
@@ -18,4 +18,7 @@
released to help encourage the spread of Erlang outside
Ericsson.
</longdescription>
+ <upstream>
+ <remote-id type="github">erlang/otp</remote-id>
+ </upstream>
</pkgmetadata>
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-07 12:16:56 +0000