head 1.3; access; symbols pkgsrc-2024Q2:1.2.0.42 pkgsrc-2024Q2-base:1.2 pkgsrc-2024Q1:1.2.0.40 pkgsrc-2024Q1-base:1.2 pkgsrc-2023Q4:1.2.0.38 pkgsrc-2023Q4-base:1.2 pkgsrc-2023Q3:1.2.0.36 pkgsrc-2023Q3-base:1.2 pkgsrc-2023Q2:1.2.0.34 pkgsrc-2023Q2-base:1.2 pkgsrc-2023Q1:1.2.0.32 pkgsrc-2023Q1-base:1.2 pkgsrc-2022Q4:1.2.0.30 pkgsrc-2022Q4-base:1.2 pkgsrc-2022Q3:1.2.0.28 pkgsrc-2022Q3-base:1.2 pkgsrc-2022Q2:1.2.0.26 pkgsrc-2022Q2-base:1.2 pkgsrc-2022Q1:1.2.0.24 pkgsrc-2022Q1-base:1.2 pkgsrc-2021Q4:1.2.0.22 pkgsrc-2021Q4-base:1.2 pkgsrc-2021Q3:1.2.0.20 pkgsrc-2021Q3-base:1.2 pkgsrc-2021Q2:1.2.0.18 pkgsrc-2021Q2-base:1.2 pkgsrc-2021Q1:1.2.0.16 pkgsrc-2021Q1-base:1.2 pkgsrc-2020Q4:1.2.0.14 pkgsrc-2020Q4-base:1.2 pkgsrc-2020Q3:1.2.0.12 pkgsrc-2020Q3-base:1.2 pkgsrc-2020Q2:1.2.0.10 pkgsrc-2020Q2-base:1.2 pkgsrc-2020Q1:1.2.0.6 pkgsrc-2020Q1-base:1.2 pkgsrc-2019Q4:1.2.0.8 pkgsrc-2019Q4-base:1.2 pkgsrc-2019Q3:1.2.0.4 pkgsrc-2019Q3-base:1.2 pkgsrc-2019Q2:1.2.0.2 pkgsrc-2019Q2-base:1.2 pkgsrc-2019Q1:1.1.0.44 pkgsrc-2019Q1-base:1.1 pkgsrc-2018Q4:1.1.0.42 pkgsrc-2018Q4-base:1.1 pkgsrc-2018Q3:1.1.0.40 pkgsrc-2018Q3-base:1.1 pkgsrc-2018Q2:1.1.0.38 pkgsrc-2018Q2-base:1.1 pkgsrc-2018Q1:1.1.0.36 pkgsrc-2018Q1-base:1.1 pkgsrc-2017Q4:1.1.0.34 pkgsrc-2017Q4-base:1.1 pkgsrc-2017Q3:1.1.0.32 pkgsrc-2017Q3-base:1.1 pkgsrc-2017Q2:1.1.0.28 pkgsrc-2017Q2-base:1.1 pkgsrc-2017Q1:1.1.0.26 pkgsrc-2017Q1-base:1.1 pkgsrc-2016Q4:1.1.0.24 pkgsrc-2016Q4-base:1.1 pkgsrc-2016Q3:1.1.0.22 pkgsrc-2016Q3-base:1.1 pkgsrc-2016Q2:1.1.0.20 pkgsrc-2016Q2-base:1.1 pkgsrc-2016Q1:1.1.0.18 pkgsrc-2016Q1-base:1.1 pkgsrc-2015Q4:1.1.0.16 pkgsrc-2015Q4-base:1.1 pkgsrc-2015Q3:1.1.0.14 pkgsrc-2015Q3-base:1.1 pkgsrc-2015Q2:1.1.0.12 pkgsrc-2015Q2-base:1.1 pkgsrc-2015Q1:1.1.0.10 pkgsrc-2015Q1-base:1.1 pkgsrc-2014Q4:1.1.0.8 pkgsrc-2014Q4-base:1.1 pkgsrc-2014Q3:1.1.0.6 pkgsrc-2014Q3-base:1.1 pkgsrc-2014Q2:1.1.0.4 pkgsrc-2014Q2-base:1.1 pkgsrc-2014Q1:1.1.0.2 pkgsrc-2014Q1-base:1.1; locks; strict; comment @# @; 1.3 date 2024.08.05.06.30.27; author wiz; state dead; branches; next 1.2; commitid bBHFyVW9uHUXcBkF; 1.2 date 2019.04.25.08.53.43; author adam; state Exp; branches; next 1.1; commitid Uc8YfLPCWBuT0IkB; 1.1 date 2014.02.13.14.38.08; author jperkin; state Exp; branches; next ; commitid pYD0nWgOozKOSWox; desc @@ 1.3 log @mysql* 5.6, 5.7: remove As proposed on pkgsrc-users on July 26. These versions are unsupported by upstream since 2018 and 2020 respectively. @ text @$NetBSD: patch-cmake_plugin.cmake,v 1.2 2019/04/25 08:53:43 adam Exp $ Build with newer DTrace. --- cmake/plugin.cmake.orig 2019-03-15 07:38:15.000000000 +0000 +++ cmake/plugin.cmake @@@@ -21,6 +21,7 @@@@ INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/cmake_ # [STORAGE_ENGINE] # [MANDATORY|DEFAULT] # [STATIC_ONLY|DYNAMIC_ONLY] +# [DTRACE_INSTRUMENTED] # [MODULE_OUTPUT_NAME module_name] # [STATIC_OUTPUT_NAME static_name] # [RECOMPILE_FOR_EMBEDDED] @@@@ -47,7 +48,7 @@@@ ENDMACRO() MACRO(MYSQL_ADD_PLUGIN) MYSQL_PARSE_ARGUMENTS(ARG "LINK_LIBRARIES;DEPENDENCIES;MODULE_OUTPUT_NAME;STATIC_OUTPUT_NAME" - "STORAGE_ENGINE;STATIC_ONLY;MODULE_ONLY;MANDATORY;DEFAULT;DISABLED;RECOMPILE_FOR_EMBEDDED;TEST_ONLY;SKIP_INSTALL" + "STORAGE_ENGINE;STATIC_ONLY;MODULE_ONLY;MANDATORY;DEFAULT;DISABLED;RECOMPILE_FOR_EMBEDDED;TEST_ONLY;SKIP_INSTALL;DTRACE_INSTRUMENTED" ${ARGN} ) @@@@ -116,7 +117,9 @@@@ MACRO(MYSQL_ADD_PLUGIN) IF (WITH_${plugin} AND NOT ARG_MODULE_ONLY) ADD_LIBRARY(${target} STATIC ${SOURCES}) SET_TARGET_PROPERTIES(${target} PROPERTIES COMPILE_DEFINITONS "MYSQL_SERVER") - DTRACE_INSTRUMENT(${target}) + IF (ARG_DTRACE_INSTRUMENTED) + DTRACE_INSTRUMENT(${target}) + ENDIF() ADD_DEPENDENCIES(${target} GenError ${ARG_DEPENDENCIES}) IF(WITH_EMBEDDED_SERVER) # Embedded library should contain PIC code and be linkable @@@@ -124,7 +127,9 @@@@ MACRO(MYSQL_ADD_PLUGIN) IF(ARG_RECOMPILE_FOR_EMBEDDED OR NOT _SKIP_PIC) # Recompile some plugins for embedded ADD_CONVENIENCE_LIBRARY(${target}_embedded ${SOURCES}) - DTRACE_INSTRUMENT(${target}_embedded) + IF (ARG_DTRACE_INSTRUMENTED) + DTRACE_INSTRUMENT(${target}_embedded) + ENDIF() IF(ARG_RECOMPILE_FOR_EMBEDDED) SET_TARGET_PROPERTIES(${target}_embedded PROPERTIES COMPILE_DEFINITIONS "MYSQL_SERVER;EMBEDDED_LIBRARY") @@@@ -170,7 +175,9 @@@@ MACRO(MYSQL_ADD_PLUGIN) ADD_VERSION_INFO(${target} MODULE SOURCES) ADD_LIBRARY(${target} MODULE ${SOURCES}) - DTRACE_INSTRUMENT(${target}) + IF (ARG_DTRACE_INSTRUMENTED) + DTRACE_INSTRUMENT(${target}) + ENDIF() SET_TARGET_PROPERTIES (${target} PROPERTIES PREFIX "" COMPILE_DEFINITIONS "MYSQL_DYNAMIC_PLUGIN") TARGET_LINK_LIBRARIES (${target} mysqlservices) @ 1.2 log @mysql56: updated to 5.6.44 mysql-5.6.44: Unknown changes @ text @d1 1 a1 1 $NetBSD: patch-cmake_plugin.cmake,v 1.1 2014/02/13 14:38:08 jperkin Exp $ @ 1.1 log @Support building with recent DTrace (v1.11 or newer). Patch from https://bugs.launchpad.net/percona-server/+bug/1196460 @ text @d1 1 a1 1 $NetBSD$ d5 1 a5 1 --- cmake/plugin.cmake.orig 2013-11-17 18:02:53.000000000 +0000 d19 2 a20 2 - "STORAGE_ENGINE;STATIC_ONLY;MODULE_ONLY;MANDATORY;DEFAULT;DISABLED;RECOMPILE_FOR_EMBEDDED" + "STORAGE_ENGINE;STATIC_ONLY;MODULE_ONLY;MANDATORY;DEFAULT;DISABLED;RECOMPILE_FOR_EMBEDDED;DTRACE_INSTRUMENTED" @