cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Unbreak the build on recent -CURRENT

Browse Source 
- Register installation conflict with v8
This commit is contained in:
Alexey Dokuchaev 2020-11-07 09:57:05 +00:00
parent ed7e145446
commit be9be499df
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=554374
4 changed files with 34 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
databases/xtrabackup/Makefile
View File

@ -28,6 +28,8 @@ LIB_DEPENDS= libcurl.so:ftp/curl \
libgpg-error.so:security/libgpg-error
RUN_DEPENDS= qpress:archivers/qpress
CONFLICTS_INSTALL= ${PORTNAME}8
# autotool is in use for 5.1 builds
USES= alias autoreconf:build bison cmake:noninja compiler:c++11-lang \
cpe gettext libtool perl5 shebangfix

11
databases/xtrabackup/files/patch-storage_innobase_fsp_fsp0fsp.cc Normal file
View File

@ -0,0 +1,11 @@
--- storage/innobase/fsp/fsp0fsp.cc.orig 2020-04-10 19:45:19 UTC
+++ storage/innobase/fsp/fsp0fsp.cc
@@ -1289,7 +1289,7 @@ fsp_header_decode_encryption_info(
if (elen == MY_AES_BAD_DATA) {
my_free(master_key);
- return(NULL);
+ return(false);
}
/* Check checksum bytes. */

11
databases/xtrabackup/files/patch-storage_innobase_xtrabackup_src_ds__tmpfile.c Normal file
View File

@ -0,0 +1,11 @@
--- storage/innobase/xtrabackup/src/ds_tmpfile.c.orig 2020-04-10 19:45:19 UTC
+++ storage/innobase/xtrabackup/src/ds_tmpfile.c
@@ -55,7 +55,7 @@ datasink_t datasink_tmpfile = {
&tmpfile_deinit
};
-MY_TMPDIR mysql_tmpdir_list;
+extern MY_TMPDIR mysql_tmpdir_list;
static ds_ctxt_t *
tmpfile_init(const char *root)

10
databases/xtrabackup/files/patch-storage_innobase_xtrabackup_src_xbstream.c Normal file
View File

@ -0,0 +1,10 @@
--- storage/innobase/xtrabackup/src/xbstream.c.orig 2020-04-10 19:45:19 UTC
+++ storage/innobase/xtrabackup/src/xbstream.c
@@ -55,7 +55,6 @@ datasink_t datasink_xbstream;
datasink_t datasink_compress;
datasink_t datasink_tmpfile;
datasink_t datasink_encrypt;
-datasink_t datasink_buffer;
static run_mode_t opt_mode;
static char * opt_directory = NULL;