Kolab Groupware OBS

Changes of Revision 4

erlang.spec Changed

@@ -63,12 +63,12 @@
 # reltool (*)
 # wx
 #
-%global __with_wxwidgets 0
+%global __with_wxwidgets 1
 
 
 Name:		erlang
 Version:	25.1.2
-Release:	1%{?dist}
+Release:	3%{?dist}
 Summary:	General-purpose programming language and runtime environment
 
 License:	ASL 2.0
@@ -242,10 +242,10 @@
 
 %package crypto
 Summary: Cryptographical support
-BuildRequires: pkgconfig(openssl)
+#BuildRequires: pkgconfig(openssl)
 # FIXME there is something wrong with OpenSSL 3.0 support in Erlang right now.
 # We have to fallback to OpenSSL1 explicitly.
-#BuildRequires: openssl1.1-devel
+BuildRequires: openssl1.1-devel
 Requires: %{name}-erts%{?_isa} = %{version}-%{release}
 Requires: %{name}-kernel%{?_isa} = %{version}-%{release}
 Requires: %{name}-stdlib%{?_isa} = %{version}-%{release}
@@ -1915,6 +1915,12 @@
 
 
 %changelog
+* Sun Nov 27 2022 Mamoru TASAKA <mtasaka@fedoraproject.org> - 25.1.2-3
+- Rebuild due to wxGLCanvas ABI change
+
+* Thu Nov 24 2022 Florian Weimer <fweimer@redhat.com> - 25.1.2-2
+- Fix C99 compatibility issues in configure checks
+
 * Tue Oct 25 2022 Peter Lemenkov <lemenkov@gmail.com> - 25.1.2-1
 - Ver. 25.1.2

erlang-configure-c99.patch Added

@@ -0,0 +1,89 @@
+Configure changes to adjust to stricter C99 compilers: Avoid
+implicit function declarations, and define main as returning int.
+
+Submitted upstream: <https://github.com/erlang/otp/pull/6504>
+
+diff --git a/erts/configure b/erts/configure
+index 815428caaf61c914..7d057e69ae5e3a93 100755
+--- a/erts/configure
++++ b/erts/configure
+@@ -20529,6 +20529,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)
+@@ -24437,10 +24440,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 fds1;
+   int fd;
+@@ -24449,9 +24455,9 @@ main()
+   fds0.events = POLLIN;
+   fds0.revents = 0;
+   if (poll(fds, 1, 0) < 0 || (fds0.revents & POLLNVAL) != 0) {
+-    exit(1);  /* Does not work for devices -- fail */
++    return 1;  /* Does not work for devices -- fail */
+   }
+-  exit(0);
++  return 0;
+ #endif
+ }
+ 
+diff --git a/erts/configure.ac b/erts/configure.ac
+index ab2ee78acdca211e..f658b66e3c0e508a 100644
+--- 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)
+@@ -3033,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 fds1;
+   int fd;
+@@ -3045,9 +3051,9 @@ main()
+   fds0.events = POLLIN;
+   fds0.revents = 0;
+   if (poll(fds, 1, 0) < 0 || (fds0.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,