diff options
| author | Florian Smeets <flo@FreeBSD.org> | 2015-10-10 23:17:57 +0000 |
|---|---|---|
| committer | Florian Smeets <flo@FreeBSD.org> | 2015-10-10 23:17:57 +0000 |
| commit | 33578b458e5112e4270bd3889b0508e31560ba2e (patch) | |
| tree | da2a9d7f2d52d3a379d300a2b3e1673c700f28a7 /databases/percona56-client | |
| parent | cdc7bf65ea01ab4c535a1dc4eddfa2fc6d961718 (diff) | |
Notes
Diffstat (limited to 'databases/percona56-client')
| -rw-r--r-- | databases/percona56-client/Makefile | 1 | ||||
| -rw-r--r-- | databases/percona56-client/files/patch-CMakeLists.txt | 11 | ||||
| -rw-r--r-- | databases/percona56-client/files/patch-vio_viosocket.c | 13 |
3 files changed, 19 insertions, 6 deletions
diff --git a/databases/percona56-client/Makefile b/databases/percona56-client/Makefile index ce1a374dd599..7c395d91b8d6 100644 --- a/databases/percona56-client/Makefile +++ b/databases/percona56-client/Makefile @@ -2,7 +2,6 @@ # $FreeBSD$ PORTNAME= percona -PORTREVISION= 2 PKGNAMESUFFIX= 56-client COMMENT= Multithreaded SQL database (client) diff --git a/databases/percona56-client/files/patch-CMakeLists.txt b/databases/percona56-client/files/patch-CMakeLists.txt index fb54f13da6f4..7a63d46f6da9 100644 --- a/databases/percona56-client/files/patch-CMakeLists.txt +++ b/databases/percona56-client/files/patch-CMakeLists.txt @@ -1,6 +1,6 @@ ---- CMakeLists.txt.orig 2014-10-06 18:06:02.000000000 +0200 -+++ CMakeLists.txt 2014-10-18 16:20:43.311977761 +0200 -@@ -468,40 +468,17 @@ +--- CMakeLists.txt 2015-09-14 17:49:16.000000000 +0200 ++++ CMakeLists.txt.new 2015-09-16 09:04:18.149047561 +0200 +@@ -471,41 +471,17 @@ ADD_SUBDIRECTORY(extra) ADD_SUBDIRECTORY(client) @@ -37,12 +37,13 @@ - ADD_SUBDIRECTORY(packaging/rpm-oel) - ADD_SUBDIRECTORY(packaging/rpm-fedora) - ADD_SUBDIRECTORY(packaging/rpm-sles) +- ADD_SUBDIRECTORY(packaging/rpm-docker) -ENDIF() - INCLUDE(cmake/abi_check.cmake) INCLUDE(cmake/tags.cmake) -@@ -568,18 +546,17 @@ +@@ -542,18 +518,17 @@ SET(CPACK_GENERATOR "TGZ") ENDIF() ADD_SUBDIRECTORY(packaging/WiX) @@ -62,7 +63,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM") INSTALL(FILES COPYING LICENSE.mysql DESTINATION ${INSTALL_DOCREADMEDIR} -@@ -605,5 +582,6 @@ +@@ -579,6 +554,7 @@ PATTERN "sp-imp-spec.txt" EXCLUDE ) ENDIF() diff --git a/databases/percona56-client/files/patch-vio_viosocket.c b/databases/percona56-client/files/patch-vio_viosocket.c new file mode 100644 index 000000000000..dee21830f520 --- /dev/null +++ b/databases/percona56-client/files/patch-vio_viosocket.c @@ -0,0 +1,13 @@ +--- vio/viosocket.c.orig 2015-07-08 07:38:39 UTC ++++ vio/viosocket.c +@@ -33,6 +33,10 @@ + static void (*before_io_wait)(void)= 0; + static void (*after_io_wait)(void)= 0; + ++#ifdef __FreeBSD__ ++#define s6_addr32 __u6_addr.__u6_addr32 ++#endif ++ + /* Wait callback macros (both performance schema and threadpool */ + #define START_SOCKET_WAIT(locker, state_ptr, sock, which, timeout) \ + do \ |