diff options
| author | brook <brook@pkgsrc.org> | 2022-04-06 18:16:13 +0000 |
|---|---|---|
| committer | brook <brook@pkgsrc.org> | 2022-04-06 18:16:13 +0000 |
| commit | d1227fd222ea06e45420f78b7ada94259660813e (patch) | |
| tree | ccf3c1500c36e0b1ee4a9dd1e59f3708d04e76f3 /databases | |
| parent | 40d95b614c75ac868ddc89636bc9124e029734cc (diff) | |
| download | pkgsrc-d1227fd222ea06e45420f78b7ada94259660813e.tar.gz | |
mariadb105-client: no need to special case __APPLE__ for pkgsrc builds
The file client/mysql.cc uses the readline library, but it has preprocessor
conditionals specially for __APPLE__. Pkgsrc expects a common readline,
however, and so the build fails. Removing the special case handles __APPLE__
the same as other platforms.
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/mariadb105-client/distinfo | 3 | ||||
| -rw-r--r-- | databases/mariadb105-client/patches/patch-client_mysql.cc | 25 |
2 files changed, 27 insertions, 1 deletions
diff --git a/databases/mariadb105-client/distinfo b/databases/mariadb105-client/distinfo index b7bec575fac..cfa74423fd7 100644 --- a/databases/mariadb105-client/distinfo +++ b/databases/mariadb105-client/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.11 2022/02/19 09:57:51 nia Exp $ +$NetBSD: distinfo,v 1.12 2022/04/06 18:16:13 brook Exp $ BLAKE2s (mariadb-10.5.15.tar.gz) = 947a7041705c273ca23d5882a1378077701fe7ab3b8e02a2914b5a96b9258853 SHA512 (mariadb-10.5.15.tar.gz) = ea3d99fd9ad8adc8187fb5d722ff16cde90c7cca4b3572e410814ae39e0246b7a83b4dc1e72f95de58c1c12a9563fb524dcca2dd1fb8f595cc41625a2fb0af76 @@ -6,6 +6,7 @@ Size (mariadb-10.5.15.tar.gz) = 102803624 bytes SHA1 (patch-BUILD_compile-pentium32-gcov) = 89a7da728f94f19c153b4d2d2d6ba5462acc941f SHA1 (patch-CMakeLists.txt) = 893f329ed03e01144df166debb4d902ad0304811 SHA1 (patch-client_CMakeLists.txt) = 8fdd8a182304f0b84e120ce95334ace23d02ce88 +SHA1 (patch-client_mysql.cc) = 89fe80fb66b8791131a8c6d1b209e57082804a01 SHA1 (patch-extra_wolfssl_wolfssl_certs_intermediate_genintcerts.sh) = cd9a982889b88f811c3e14ebdf9795b0fa5d1fad SHA1 (patch-include_my__global.h) = a3b831f91ba2efea9f78e70ab4f706da23b80403 SHA1 (patch-mysys_my__context.c) = f9c7e6b3b68b857e7781cf5f36c49e88051cfb66 diff --git a/databases/mariadb105-client/patches/patch-client_mysql.cc b/databases/mariadb105-client/patches/patch-client_mysql.cc new file mode 100644 index 00000000000..2dc2ddb9852 --- /dev/null +++ b/databases/mariadb105-client/patches/patch-client_mysql.cc @@ -0,0 +1,25 @@ +$NetBSD: patch-client_mysql.cc,v 1.1 2022/04/06 18:16:13 brook Exp $ + +Do not special case __APPLE__ for pkgsrc builds. + +--- client/mysql.cc.orig 2022-02-10 20:11:29.000000000 +0000 ++++ client/mysql.cc +@@ -91,14 +91,10 @@ extern "C" { + #if defined(__WIN__) + #include <conio.h> + #else +-# ifdef __APPLE__ +-# include <editline/readline.h> +-# else +-# include <readline.h> +-# if !defined(USE_LIBEDIT_INTERFACE) +-# include <history.h> +-# endif +-# endif ++#include <readline.h> ++#if !defined(USE_LIBEDIT_INTERFACE) ++# include <history.h> ++#endif + #define HAVE_READLINE + #endif + #define USE_POPEN |