View | Details | Raw Unified | Return to bug 239271 | Differences between
and this patch

Collapse All | Expand All

(-)mysql57-server/Makefile (-2 / +2 lines)
Lines 2-9 Link Here
2
# $FreeBSD: head/databases/mysql57-server/Makefile 507372 2019-07-26 20:46:53Z gerald $
2
# $FreeBSD: head/databases/mysql57-server/Makefile 507372 2019-07-26 20:46:53Z gerald $
3
3
4
PORTNAME?=	mysql
4
PORTNAME?=	mysql
5
PORTVERSION=	5.7.26
5
PORTVERSION=	5.7.27
6
PORTREVISION?=	4
6
PORTREVISION?=	
7
CATEGORIES=	databases ipv6
7
CATEGORIES=	databases ipv6
8
MASTER_SITES=	MYSQL/MySQL-5.7
8
MASTER_SITES=	MYSQL/MySQL-5.7
9
PKGNAMESUFFIX?=	57-server
9
PKGNAMESUFFIX?=	57-server
(-)mysql57-server/distinfo (-2 / +2 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1556318914
1
TIMESTAMP = 1556318914
2
SHA256 (mysql-boost-5.7.26.tar.gz) = effca6d3aceebc286a9fb046257330d125cc2f4def87081c286bfc4df3d974d1
2
SHA256 (mysql-boost-5.7.27.tar.gz) = 036ab46a8a1216cfc1e87374bd1cba12e2208c02cf328a31851be7e1c7f57a2b
3
SIZE (mysql-boost-5.7.26.tar.gz) = 51098338
3
SIZE (mysql-boost-5.7.27.tar.gz) = 51436383
(-)mysql57-server/files/patch-scripts_CMakeLists.txt (-8 / +8 lines)
Lines 1-15 Link Here
1
--- scripts/CMakeLists.txt.orig	2016-03-28 18:06:12 UTC
1
--- scripts/CMakeLists.txt.orig	2019-06-10 10:43:20.000000000 -0400
2
+++ scripts/CMakeLists.txt
2
+++ scripts/CMakeLists.txt	2019-08-01 10:10:16.206052000 -0400
3
@@ -347,6 +347,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var)
3
@@ -326,6 +326,8 @@
4
           GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE)
4
           GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE)
5
           STRING(REGEX REPLACE "^lib" "" lib "${lib}")
5
           STRING(REGEX REPLACE "^lib" "" lib "${lib}")
6
           SET(${var} "${${var}}-l${lib} " ) 
6
           SET(${var} "${${var}}-l${lib} " )
7
+        ELSEIF(lib STREQUAL "-pthread")
7
+        ELSEIF(lib STREQUAL "-pthread")
8
+          SET(${var} "${${var}}-pthread " ) 
8
+          SET(${var} "${${var}}-pthread " )
9
         ELSE()
9
         ELSE()
10
           SET(${var} "${${var}}-l${lib} " ) 
10
           SET(${var} "${${var}}-l${lib} " )
11
         ENDIF()
11
         ENDIF()
12
@@ -430,14 +432,13 @@ ELSE()
12
@@ -411,14 +413,13 @@
13
   # On Unix, most of the files end up in the bin directory
13
   # On Unix, most of the files end up in the bin directory
14
   SET(mysql_config_COMPONENT COMPONENT Development)
14
   SET(mysql_config_COMPONENT COMPONENT Development)
15
 
15
 
Lines 25-31 Link Here
25
       mysqldumpslow
25
       mysqldumpslow
26
       mysqld_multi
26
       mysqld_multi
27
       mysqld_safe
27
       mysqld_safe
28
@@ -471,7 +472,7 @@ ELSE()
28
@@ -452,7 +453,7 @@
29
   FOREACH(file ${BIN_SCRIPTS})
29
   FOREACH(file ${BIN_SCRIPTS})
30
     IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh)
30
     IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh)
31
       CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh
31
       CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh

Return to bug 239271