Skip to content

Commit

Permalink
Patch Erlang build on Alpine
Browse files Browse the repository at this point in the history
Works around this issue: erlang/otp#9211

* Add patch file for Erlang 27.2
* Add patch file for Erlang 26.2.5.6
  • Loading branch information
lukebakken committed Dec 18, 2024
1 parent 16db9e1 commit f086e28
Show file tree
Hide file tree
Showing 23 changed files with 266 additions and 40 deletions.
25 changes: 18 additions & 7 deletions 3.13/alpine/Dockerfile

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Empty file.
22 changes: 22 additions & 0 deletions 3.13/alpine/patch/otp/26.2.5.6/erts-configure.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
--- erts/configure.orig
+++ erts/configure
@@ -20934,6 +20934,7 @@
/* end confdefs.h. */

#include <stdlib.h>
+#include <unistd.h>
#ifdef HAVE_MALLOC_H
# include <malloc.h>
#endif
@@ -24889,8 +24890,10 @@
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */

+#include <fcntl.h>
#include <poll.h>
-main()
+#include <stdlib.h>
+int main()
{
#ifdef _POLL_EMUL_H_
exit(1); /* Implemented using select() -- fail */
22 changes: 22 additions & 0 deletions 3.13/alpine/patch/otp/27.2/erts-configure.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
--- erts/configure.orig
+++ erts/configure
@@ -21677,6 +21677,7 @@
/* end confdefs.h. */

#include <stdlib.h>
+#include <unistd.h>
#ifdef HAVE_MALLOC_H
# include <malloc.h>
#endif
@@ -25866,8 +25867,10 @@
e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */

+#include <fcntl.h>
#include <poll.h>
-main()
+#include <stdlib.h>
+int main()
{
#ifdef _POLL_EMUL_H_
exit(1); /* Implemented using select() -- fail */
6 changes: 3 additions & 3 deletions 3.13/ubuntu/Dockerfile

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

25 changes: 18 additions & 7 deletions 4.0/alpine/Dockerfile

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Empty file.
22 changes: 22 additions & 0 deletions 4.0/alpine/patch/otp/26.2.5.6/erts-configure.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
--- erts/configure.orig
+++ erts/configure
@@ -20934,6 +20934,7 @@
/* end confdefs.h. */

#include <stdlib.h>
+#include <unistd.h>
#ifdef HAVE_MALLOC_H
# include <malloc.h>
#endif
@@ -24889,8 +24890,10 @@
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */

+#include <fcntl.h>
#include <poll.h>
-main()
+#include <stdlib.h>
+int main()
{
#ifdef _POLL_EMUL_H_
exit(1); /* Implemented using select() -- fail */
22 changes: 22 additions & 0 deletions 4.0/alpine/patch/otp/27.2/erts-configure.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
--- erts/configure.orig
+++ erts/configure
@@ -21677,6 +21677,7 @@
/* end confdefs.h. */

#include <stdlib.h>
+#include <unistd.h>
#ifdef HAVE_MALLOC_H
# include <malloc.h>
#endif
@@ -25866,8 +25867,10 @@
e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */

+#include <fcntl.h>
#include <poll.h>
-main()
+#include <stdlib.h>
+int main()
{
#ifdef _POLL_EMUL_H_
exit(1); /* Implemented using select() -- fail */
6 changes: 3 additions & 3 deletions 4.0/ubuntu/Dockerfile

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

25 changes: 18 additions & 7 deletions 4.1-rc/alpine/Dockerfile

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Empty file.
22 changes: 22 additions & 0 deletions 4.1-rc/alpine/patch/otp/26.2.5.6/erts-configure.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
--- erts/configure.orig
+++ erts/configure
@@ -20934,6 +20934,7 @@
/* end confdefs.h. */

#include <stdlib.h>
+#include <unistd.h>
#ifdef HAVE_MALLOC_H
# include <malloc.h>
#endif
@@ -24889,8 +24890,10 @@
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */

+#include <fcntl.h>
#include <poll.h>
-main()
+#include <stdlib.h>
+int main()
{
#ifdef _POLL_EMUL_H_
exit(1); /* Implemented using select() -- fail */
22 changes: 22 additions & 0 deletions 4.1-rc/alpine/patch/otp/27.2/erts-configure.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
--- erts/configure.orig
+++ erts/configure
@@ -21677,6 +21677,7 @@
/* end confdefs.h. */

#include <stdlib.h>
+#include <unistd.h>
#ifdef HAVE_MALLOC_H
# include <malloc.h>
#endif
@@ -25866,8 +25867,10 @@
e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */

+#include <fcntl.h>
#include <poll.h>
-main()
+#include <stdlib.h>
+int main()
{
#ifdef _POLL_EMUL_H_
exit(1); /* Implemented using select() -- fail */
Loading

0 comments on commit f086e28

Please sign in to comment.