Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Arch fixes for gnutls and libzvbi #301

Open
wants to merge 2 commits into
base: Omega
Choose a base branch
from
Open

Arch fixes for gnutls and libzvbi #301

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0b748b1
Fix build of zvbi: FTBFS: io-sim.c:128:1: error: static declaration of
boogieeeee Jun 22, 2024
fbc0a4e
Fix build of gnutls: When static linking hogweed interferes with nettle
boogieeeee Jun 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions depends/common/gnutls/0004-hogweed-nettle-link-order.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/configure b/configure
index e7bb291..a621557 100644
--- a/configure
+++ b/configure
@@ -12611,7 +12611,7 @@
printf "%s\n" "#define HAVE_LIBNETTLE 1" >>confdefs.h


- GNUTLS_REQUIRES_PRIVATE="Requires.private: nettle, hogweed"
+ GNUTLS_REQUIRES_PRIVATE="Requires.private: hogweed, nettle"


# Check whether --with-nettle-mini was given.
42 changes: 42 additions & 0 deletions depends/common/libzvbi/0011-fix-zvbi.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
diff --git a/configure.ac b/configure.ac
index 3737442..72760a9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -82,7 +82,7 @@
inet_ntoa localtime_r memmove memset mkdir modf munmap \
nl_langinfo putenv select setenv setlocale socket strcasecmp \
strchr strdup strerror strncasecmp strndup strrchr strstr \
- strtol strtoul tzset strptime getaddrinfo])
+ strtol strtoul tzset strptime getaddrinfo sincos])

AM_CONDITIONAL(HAVE_STRPTIME, [test "x$HAVE_STRPTIME" = xyes])

@@ -103,28 +103,6 @@
dnl "Noteworthy changes in autoconf version 2.66 through 2.68"
dnl <https://autotools.info/forwardporting/autoconf.html>

-dnl sincos() is a GNU extension (a macro, not a function).
-dnl If not present we use a replacement.
-AC_MSG_CHECKING([for sincos])
-AC_LINK_IFELSE([AC_LANG_SOURCE([
-#include <stdio.h>
-#include <math.h>
-int main (void) {
-double s, c;
-/* Make sure the compiler does not optimize sincos() away
- so the linker can confirm its availability. */
-scanf ("%f", &s);
-sincos (s, &s, &c);
-printf ("%f %f", s, c);
-return 0;
-}
-])],[
- AC_MSG_RESULT([yes])
- AC_DEFINE(HAVE_SINCOS, 1, [Define if the sincos() function is available])
-],[
- AC_MSG_RESULT([no])
-])
-
dnl log2() is a GNU extension (a macro, not a function).
dnl If not present we use a replacement.
AC_MSG_CHECKING([for log2])
Loading