Skip to content

Commit f086e28

Browse files
lukebakkenlukebakken
committed
Patch Erlang build on Alpine
Works around this issue: erlang/otp#9211 * Add patch file for Erlang 27.2 * Add patch file for Erlang 26.2.5.6
1 parent 16db9e1 commit f086e28

23 files changed

+266
-40
lines changed

‎3.13/alpine/Dockerfile

+18-7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎3.13/alpine/patch/otp/26.2.5.6/.gitkeep

Whitespace-only changes.

‎3.13/alpine/patch/otp/26.2.5.6/erts-configure.patch

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
--- erts/configure.orig
2+
+++ erts/configure
3+
@@ -20934,6 +20934,7 @@
4+
/* end confdefs.h. */
5+
6+
#include <stdlib.h>
7+
+#include <unistd.h>
8+
#ifdef HAVE_MALLOC_H
9+
# include <malloc.h>
10+
#endif
11+
@@ -24889,8 +24890,10 @@
12+
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
13+
/* end confdefs.h. */
14+
15+
+#include <fcntl.h>
16+
#include <poll.h>
17+
-main()
18+
+#include <stdlib.h>
19+
+int main()
20+
{
21+
#ifdef _POLL_EMUL_H_
22+
exit(1); /* Implemented using select() -- fail */

‎3.13/alpine/patch/otp/27.2/erts-configure.patch

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
--- erts/configure.orig
2+
+++ erts/configure
3+
@@ -21677,6 +21677,7 @@
4+
/* end confdefs.h. */
5+
6+
#include <stdlib.h>
7+
+#include <unistd.h>
8+
#ifdef HAVE_MALLOC_H
9+
# include <malloc.h>
10+
#endif
11+
@@ -25866,8 +25867,10 @@
12+
e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
13+
/* end confdefs.h. */
14+
15+
+#include <fcntl.h>
16+
#include <poll.h>
17+
-main()
18+
+#include <stdlib.h>
19+
+int main()
20+
{
21+
#ifdef _POLL_EMUL_H_
22+
exit(1); /* Implemented using select() -- fail */

‎3.13/ubuntu/Dockerfile

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎4.0/alpine/Dockerfile

+18-7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎4.0/alpine/patch/otp/26.2.5.6/.gitkeep

Whitespace-only changes.

‎4.0/alpine/patch/otp/26.2.5.6/erts-configure.patch

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
--- erts/configure.orig
2+
+++ erts/configure
3+
@@ -20934,6 +20934,7 @@
4+
/* end confdefs.h. */
5+
6+
#include <stdlib.h>
7+
+#include <unistd.h>
8+
#ifdef HAVE_MALLOC_H
9+
# include <malloc.h>
10+
#endif
11+
@@ -24889,8 +24890,10 @@
12+
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
13+
/* end confdefs.h. */
14+
15+
+#include <fcntl.h>
16+
#include <poll.h>
17+
-main()
18+
+#include <stdlib.h>
19+
+int main()
20+
{
21+
#ifdef _POLL_EMUL_H_
22+
exit(1); /* Implemented using select() -- fail */

‎4.0/alpine/patch/otp/27.2/erts-configure.patch

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
--- erts/configure.orig
2+
+++ erts/configure
3+
@@ -21677,6 +21677,7 @@
4+
/* end confdefs.h. */
5+
6+
#include <stdlib.h>
7+
+#include <unistd.h>
8+
#ifdef HAVE_MALLOC_H
9+
# include <malloc.h>
10+
#endif
11+
@@ -25866,8 +25867,10 @@
12+
e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
13+
/* end confdefs.h. */
14+
15+
+#include <fcntl.h>
16+
#include <poll.h>
17+
-main()
18+
+#include <stdlib.h>
19+
+int main()
20+
{
21+
#ifdef _POLL_EMUL_H_
22+
exit(1); /* Implemented using select() -- fail */

‎4.0/ubuntu/Dockerfile

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎4.1-rc/alpine/Dockerfile

+18-7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎4.1-rc/alpine/patch/otp/26.2.5.6/.gitkeep

Whitespace-only changes.

‎4.1-rc/alpine/patch/otp/26.2.5.6/erts-configure.patch

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
--- erts/configure.orig
2+
+++ erts/configure
3+
@@ -20934,6 +20934,7 @@
4+
/* end confdefs.h. */
5+
6+
#include <stdlib.h>
7+
+#include <unistd.h>
8+
#ifdef HAVE_MALLOC_H
9+
# include <malloc.h>
10+
#endif
11+
@@ -24889,8 +24890,10 @@
12+
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
13+
/* end confdefs.h. */
14+
15+
+#include <fcntl.h>
16+
#include <poll.h>
17+
-main()
18+
+#include <stdlib.h>
19+
+int main()
20+
{
21+
#ifdef _POLL_EMUL_H_
22+
exit(1); /* Implemented using select() -- fail */

‎4.1-rc/alpine/patch/otp/27.2/erts-configure.patch

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
--- erts/configure.orig
2+
+++ erts/configure
3+
@@ -21677,6 +21677,7 @@
4+
/* end confdefs.h. */
5+
6+
#include <stdlib.h>
7+
+#include <unistd.h>
8+
#ifdef HAVE_MALLOC_H
9+
# include <malloc.h>
10+
#endif
11+
@@ -25866,8 +25867,10 @@
12+
e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
13+
/* end confdefs.h. */
14+
15+
+#include <fcntl.h>
16+
#include <poll.h>
17+
-main()
18+
+#include <stdlib.h>
19+
+int main()
20+
{
21+
#ifdef _POLL_EMUL_H_
22+
exit(1); /* Implemented using select() -- fail */

0 commit comments

Comments
 (0)