Attachment #256302 for bug #283752

View | Details | Raw Unified | Return to bug 283752
Collapse All | Expand All

Lines 1-5 Link Here

(-)b/databases/mysql84-client/Makefile (-1 lines)
1	PORTNAME= mysql	1	PORTNAME= mysql
2	PORTREVISION= 1
3	PKGNAMESUFFIX= 84-client	2	PKGNAMESUFFIX= 84-client
4		3
5	COMMENT= Multithreaded SQL database (client)	4	COMMENT= Multithreaded SQL database (client)

Lines 1-6 Link Here

(-)b/databases/mysql84-server/Makefile (-2 / +1 lines)
1	PORTNAME?= mysql	1	PORTNAME?= mysql
2	PORTVERSION= 8.4.2	2	PORTVERSION= 8.4.3
3	PORTREVISION?= 1
4	CATEGORIES= databases	3	CATEGORIES= databases
5	MASTER_SITES= MYSQL/MySQL-8.4	4	MASTER_SITES= MYSQL/MySQL-8.4
6	PKGNAMESUFFIX?= 84-server	5	PKGNAMESUFFIX?= 84-server

Lines 1-3 Link Here

(-)b/databases/mysql84-server/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1721979278	1	TIMESTAMP = 1735595165
2	SHA256 (mysql-8.4.2.tar.gz) = 5657a78dc86bf0bf2227e0b05f8de5a2c447a816a112ffa26fa70083bcbe9814	2	SHA256 (mysql-8.4.3.tar.gz) = 7ac9564c478022f73005ff89bbb40f67b381fc06d5518416bdffec75e625b818
3	SIZE (mysql-8.4.2.tar.gz) = 425791134	3	SIZE (mysql-8.4.3.tar.gz) = 465097732




--- CMakeLists.txt.orig	2024-09-17 10:40:37 UTC
+++ CMakeLists.txt
@@ -1870,7 +1870,7 @@ IF(WITH_AUTHENTICATION_LDAP)
 ENDIF()
 
 IF(WITH_AUTHENTICATION_LDAP)

     # LDAP / SASL / KERBEROS / SSL must all be "system" or "custom", not a mix.
     IF(WITH_LDAP STREQUAL "system" OR
         WITH_SASL STREQUAL "system" OR
@@ -1921,6 +1921,7 @@ ENDIF()
   ENDIF()
 ENDIF()
 

 # Add system/bundled editline.
 MYSQL_CHECK_EDITLINE()
 SET(EDITLINE_WARN_GIVEN)
@@ -1931,6 +1932,7 @@ ENDIF()
     "You can use -DWITH_EDITLINE=bundled instead."
     )
 ENDIF()

 
 # Add lz4 library
 MYSQL_CHECK_LZ4()
@@ -2213,7 +2215,9 @@ ADD_DEPENDENCIES(clang_tidy_prerequisites GenError)
 ADD_DEPENDENCIES(clang_tidy_prerequisites protobuf_generated_all)
 ADD_DEPENDENCIES(clang_tidy_prerequisites GenError)
 

 ADD_SUBDIRECTORY(strings)
 ADD_SUBDIRECTORY(vio)
 ADD_SUBDIRECTORY(mysys)
@@ -2263,12 +2267,15 @@ ENDIF()
   ADD_SUBDIRECTORY(unittest/mytap/t)
 ENDIF()
 

   ADD_SUBDIRECTORY(testclients)
   ADD_SUBDIRECTORY(sql)
 ENDIF()
@@ -2346,11 +2353,11 @@ ADD_SUBDIRECTORY(scripts)
 # scripts/mysql_config depends on client and server targets loaded above.
 # It is referenced by some of the directories below, so we insert it here.
 ADD_SUBDIRECTORY(scripts)

   IF(WITH_INTERNAL)
     ADD_SUBDIRECTORY(internal)
   ENDIF()
@@ -2377,8 +2384,10 @@ ENDIF()
   INCLUDE(fastcov)
 ENDIF()
 




--- client/CMakeLists.txt.orig	2024-09-17 10:40:37 UTC
+++ client/CMakeLists.txt
@@ -26,9 +26,12 @@ DISABLE_MISSING_PROFILE_WARNING()
 # We are not interesting in profiling clients.

 MYSQL_ADD_EXECUTABLE(mysqltest
   mysqltest.cc
   mysqltest/error_names.cc
@@ -64,6 +69,9 @@ ENDIF()
   TARGET_LINK_OPTIONS(mysqltest PRIVATE -Wno-error=stringop-overflow)
 ENDIF()
 
+ENDIF()
+
+IF(WITHOUT_SERVER)
 MYSQL_ADD_EXECUTABLE(mysqlcheck
   check/mysqlcheck.cc
   check/mysqlcheck_core.cc
@@ -289,7 +297,9 @@ TARGET_INCLUDE_DIRECTORIES(mysqlbinlog PRIVATE ${CMAKE
 
 TARGET_COMPILE_DEFINITIONS(mysqlbinlog PRIVATE DISABLE_PSI_MUTEX)
 TARGET_INCLUDE_DIRECTORIES(mysqlbinlog PRIVATE ${CMAKE_SOURCE_DIR}/sql)

 MYSQL_ADD_EXECUTABLE(mysqladmin
   mysqladmin.cc
   multi_factor_passwordopt-vars.cc
@@ -304,10 +314,14 @@ MYSQL_ADD_EXECUTABLE(mysql_config_editor
   mysql_config_editor.cc
   LINK_LIBRARIES mysqlclient
   )

Return to bug 283752

Lines 1-6 Link Here

(-)b/databases/mysql84-server/files/patch-CMakeLists.txt (-8 / +8 lines)
1	--- CMakeLists.txt.orig 2024-06-03 11:39:00 UTC	1	--- CMakeLists.txt.orig 2024-09-17 10:40:37 UTC
2	+++ CMakeLists.txt	2	+++ CMakeLists.txt
3	@@ -1845,7 +1845,7 @@ IF(WITH_AUTHENTICATION_LDAP)	3	@@ -1870,7 +1870,7 @@ IF(WITH_AUTHENTICATION_LDAP)
4	ENDIF()	4	ENDIF()
5		5
6	IF(WITH_AUTHENTICATION_LDAP)	6	IF(WITH_AUTHENTICATION_LDAP)
Lines 9-15 Link Here
9	# LDAP / SASL / KERBEROS / SSL must all be "system" or "custom", not a mix.	9	# LDAP / SASL / KERBEROS / SSL must all be "system" or "custom", not a mix.
10	IF(WITH_LDAP STREQUAL "system" OR	10	IF(WITH_LDAP STREQUAL "system" OR
11	WITH_SASL STREQUAL "system" OR	11	WITH_SASL STREQUAL "system" OR
12	@@ -1896,6 +1896,7 @@ ENDIF()	12	@@ -1921,6 +1921,7 @@ ENDIF()
13	ENDIF()	13	ENDIF()
14	ENDIF()	14	ENDIF()
15		15
Lines 17-23 Link Here
17	# Add system/bundled editline.	17	# Add system/bundled editline.
18	MYSQL_CHECK_EDITLINE()	18	MYSQL_CHECK_EDITLINE()
19	SET(EDITLINE_WARN_GIVEN)	19	SET(EDITLINE_WARN_GIVEN)
20	@@ -1906,6 +1907,7 @@ ENDIF()	20	@@ -1931,6 +1932,7 @@ ENDIF()
21	"You can use -DWITH_EDITLINE=bundled instead."	21	"You can use -DWITH_EDITLINE=bundled instead."
22	)	22	)
23	ENDIF()	23	ENDIF()
Lines 25-31 Link Here
25		25
26	# Add lz4 library	26	# Add lz4 library
27	MYSQL_CHECK_LZ4()	27	MYSQL_CHECK_LZ4()
28	@@ -2189,7 +2191,9 @@ ADD_DEPENDENCIES(clang_tidy_prerequisites GenError)	28	@@ -2213,7 +2215,9 @@ ADD_DEPENDENCIES(clang_tidy_prerequisites GenError)
29	ADD_DEPENDENCIES(clang_tidy_prerequisites protobuf_generated_all)	29	ADD_DEPENDENCIES(clang_tidy_prerequisites protobuf_generated_all)
30	ADD_DEPENDENCIES(clang_tidy_prerequisites GenError)	30	ADD_DEPENDENCIES(clang_tidy_prerequisites GenError)
31		31
Lines 36-42 Link Here
36	ADD_SUBDIRECTORY(strings)	36	ADD_SUBDIRECTORY(strings)
37	ADD_SUBDIRECTORY(vio)	37	ADD_SUBDIRECTORY(vio)
38	ADD_SUBDIRECTORY(mysys)	38	ADD_SUBDIRECTORY(mysys)
39	@@ -2239,12 +2243,15 @@ ENDIF()	39	@@ -2263,12 +2267,15 @@ ENDIF()
40	ADD_SUBDIRECTORY(unittest/mytap/t)	40	ADD_SUBDIRECTORY(unittest/mytap/t)
41	ENDIF()	41	ENDIF()
42		42
Lines 54-60 Link Here
54	ADD_SUBDIRECTORY(testclients)	54	ADD_SUBDIRECTORY(testclients)
55	ADD_SUBDIRECTORY(sql)	55	ADD_SUBDIRECTORY(sql)
56	ENDIF()	56	ENDIF()
57	@@ -2322,11 +2329,11 @@ ADD_SUBDIRECTORY(scripts)	57	@@ -2346,11 +2353,11 @@ ADD_SUBDIRECTORY(scripts)
58	# scripts/mysql_config depends on client and server targets loaded above.	58	# scripts/mysql_config depends on client and server targets loaded above.
59	# It is referenced by some of the directories below, so we insert it here.	59	# It is referenced by some of the directories below, so we insert it here.
60	ADD_SUBDIRECTORY(scripts)	60	ADD_SUBDIRECTORY(scripts)
Lines 67-73 Link Here
67	IF(WITH_INTERNAL)	67	IF(WITH_INTERNAL)
68	ADD_SUBDIRECTORY(internal)	68	ADD_SUBDIRECTORY(internal)
69	ENDIF()	69	ENDIF()
70	@@ -2354,8 +2361,10 @@ ENDIF()	70	@@ -2377,8 +2384,10 @@ ENDIF()
71	INCLUDE(fastcov)	71	INCLUDE(fastcov)
72	ENDIF()	72	ENDIF()
73		73

Lines 1-4 Link Here

(-)b/databases/mysql84-server/files/patch-client_CMakeLists.txt (-7 / +7 lines)
1	--- client/CMakeLists.txt.orig 2024-04-10 06:26:28 UTC	1	--- client/CMakeLists.txt.orig 2024-09-17 10:40:37 UTC
2	+++ client/CMakeLists.txt	2	+++ client/CMakeLists.txt
3	@@ -26,9 +26,12 @@ DISABLE_MISSING_PROFILE_WARNING()	3	@@ -26,9 +26,12 @@ DISABLE_MISSING_PROFILE_WARNING()
4	# We are not interesting in profiling clients.	4	# We are not interesting in profiling clients.
Lines 23-39 Link Here
23	MYSQL_ADD_EXECUTABLE(mysqltest	23	MYSQL_ADD_EXECUTABLE(mysqltest
24	mysqltest.cc	24	mysqltest.cc
25	mysqltest/error_names.cc	25	mysqltest/error_names.cc
26	@@ -59,6 +64,9 @@ MYSQL_ADD_EXECUTABLE(mysqltest	26	@@ -64,6 +69,9 @@ ENDIF()
27	ENABLE_EXPORTS	27	TARGET_LINK_OPTIONS(mysqltest PRIVATE -Wno-error=stringop-overflow)
28	LINK_LIBRARIES mysqlclient	28	ENDIF()
29	)	29
30	+ENDIF()	30	+ENDIF()
31	+	31	+
32	+IF(WITHOUT_SERVER)	32	+IF(WITHOUT_SERVER)
33	MYSQL_ADD_EXECUTABLE(mysqlcheck	33	MYSQL_ADD_EXECUTABLE(mysqlcheck
34	check/mysqlcheck.cc	34	check/mysqlcheck.cc
35	check/mysqlcheck_core.cc	35	check/mysqlcheck_core.cc
36	@@ -274,7 +282,9 @@ TARGET_INCLUDE_DIRECTORIES(mysqlbinlog PRIVATE ${CMAKE	36	@@ -289,7 +297,9 @@ TARGET_INCLUDE_DIRECTORIES(mysqlbinlog PRIVATE ${CMAKE
37		37
38	TARGET_COMPILE_DEFINITIONS(mysqlbinlog PRIVATE DISABLE_PSI_MUTEX)	38	TARGET_COMPILE_DEFINITIONS(mysqlbinlog PRIVATE DISABLE_PSI_MUTEX)
39	TARGET_INCLUDE_DIRECTORIES(mysqlbinlog PRIVATE ${CMAKE_SOURCE_DIR}/sql)	39	TARGET_INCLUDE_DIRECTORIES(mysqlbinlog PRIVATE ${CMAKE_SOURCE_DIR}/sql)
Lines 43-49 Link Here
43	MYSQL_ADD_EXECUTABLE(mysqladmin	43	MYSQL_ADD_EXECUTABLE(mysqladmin
44	mysqladmin.cc	44	mysqladmin.cc
45	multi_factor_passwordopt-vars.cc	45	multi_factor_passwordopt-vars.cc
46	@@ -289,10 +299,14 @@ MYSQL_ADD_EXECUTABLE(mysql_config_editor	46	@@ -304,10 +314,14 @@ MYSQL_ADD_EXECUTABLE(mysql_config_editor
47	mysql_config_editor.cc	47	mysql_config_editor.cc
48	LINK_LIBRARIES mysqlclient	48	LINK_LIBRARIES mysqlclient
49	)	49	)