-
Notifications
You must be signed in to change notification settings - Fork 3.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* OPUS and Pulse can be configured nicely by default now, no longer need a local patch for that * mysql version checks fail when cross-compiling, add patch to remove them and always assume MySQL >8.0. * Package new services, communicators, ... This is a new major release. It breaks protocol compatibility with the 0.15.x versions. Please be aware that Git master is thus henceforth (and has been for a while) INCOMPATIBLE with the 0.15.x GNUnet network, and interactions between old and new peers will result in issues. 0.15.x peers will be able to communicate with Git master or 0.16.x peers, but some services - in particular GNS - will not be compatible. Signed-off-by: Daniel Golle <daniel@makrotopia.org>
- Loading branch information
Showing
4 changed files
with
67 additions
and
58 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
36 changes: 0 additions & 36 deletions
36
net/gnunet/patches/100-fix-opus-and-pulse-library-detection.patch
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,38 @@ | ||
--- a/configure.ac | ||
+++ b/configure.ac | ||
@@ -978,33 +978,13 @@ AC_ARG_WITH([mysql], | ||
AC_CHECK_LIB([mysqlclient], [mysql_init], | ||
[AC_CHECK_HEADERS([mysql/mysql.h], | ||
[MYSQL_LDFLAGS="-L$MYSQL_LIBDIR" | ||
- mysql=true], | ||
+ mysql=true | ||
+ mysql8=true], | ||
[mysql=false])], | ||
[mysql=false])]) | ||
AC_SUBST(MYSQL_LDFLAGS) | ||
AC_SUBST(MYSQL_CPPFLAGS) | ||
|
||
-# additional version checks for mysql | ||
-AS_IF([test "x$mysql" = "xtrue"], | ||
- [AC_MSG_CHECKING([for mysql version]) | ||
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM( | ||
- [[include <mysql/mysql_version.h>]], | ||
- [[#if (MYSQL_VERSION_ID < 40100) | ||
-#error required at least version 4.1 | ||
-#endif]])], | ||
- [mysql=true], | ||
- [mysql=false]) | ||
- AS_IF([test "x$mysql" = "xfalse"], | ||
- [AC_MSG_RESULT([< 4.1]) | ||
- AC_MSG_RESULT([mysql version >= 4.1 required. Will not use MySQL])]) | ||
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM( | ||
- [[#include <mysql/mysql_version.h>]], | ||
- [[#if (MYSQL_VERSION_ID < 80000) | ||
-#error needs at least version 8.0 | ||
-#endif]])], | ||
- [mysql8=true], | ||
- [mysql8=false])]) | ||
- | ||
AS_IF([test "x$mysql" = "xtrue"], | ||
[AS_IF([test "x$mysql8" = "xfalse"], | ||
[AC_MSG_RESULT([between 4.1 and 8.0])], |