Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
home:darix:playground
MaxScale
debugflags.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File debugflags.patch of Package MaxScale
diff --git a/CMakeLists.txt b/CMakeLists.txt index f0fd0c6..2792877 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -44,7 +44,9 @@ find_package(RabbitMQ) # Build PCRE2 # Read BuildPCRE2 for details about how to add pcre2 as a dependency to a target -include(cmake/BuildPCRE2.cmake) +#include(cmake/BuildPCRE2.cmake) +pkg_check_modules (PCRE2 libpcre2-8 Required) +FIND_PACKAGE ( Threads REQUIRED ) # You can find the variables set by this in the FindCURL.cmake file # which is a default module in CMake. @@ -83,7 +85,7 @@ else() set(MAXSCALE_COMMIT "source-build") endif() -set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_RPATH}:${CMAKE_INSTALL_PREFIX}/${MAXSCALE_LIBDIR}) +#set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/${MAXSCALE_LIBDIR}) # Make sure the release notes for this release are present if it is a stable one if(${MAXSCALE_VERSION} MATCHES "-stable") @@ -379,3 +381,6 @@ if(PACKAGE) message(STATUS "You can install startup scripts and system configuration files for MaxScale by running the 'postinst' shell script located at ${CMAKE_INSTALL_PREFIX}.") message(STATUS "To remove these installed files, run the 'postrm' shell script located in the same folder.") endif() + +MESSAGE(STATUS " C compiler flags ................ : ${CMAKE_C_FLAGS}${cfsp}${CMAKE_C_FLAGS_${buildtype}}") +MESSAGE(STATUS " CXX compiler flags ................ : ${CMAKE_CXX_FLAGS}${cfsp}${CMAKE_CXX_FLAGS_${buildtype}}") diff --git a/server/core/CMakeLists.txt b/server/core/CMakeLists.txt index 9f29ba7..c830269 100644 --- a/server/core/CMakeLists.txt +++ b/server/core/CMakeLists.txt @@ -6,7 +6,7 @@ if(BUILD_TESTS OR BUILD_TOOLS) target_link_libraries(fullcore ${TCMALLOC_LIBRARIES}) endif() target_link_libraries(fullcore ${CURL_LIBRARIES} utils ${PCRE2_LIBRARIES} log_manager pthread ${LZMA_LINK_FLAGS} ${EMBEDDED_LIB} ${PCRE_LINK_FLAGS} ssl aio rt crypt dl crypto inih z m stdc++) - add_dependencies(fullcore pcre2) + # add_dependencies(fullcore pcre2) endif() add_executable(maxscale atomic.c buffer.c spinlock.c gateway.c @@ -14,7 +14,14 @@ add_executable(maxscale atomic.c buffer.c spinlock.c gateway.c poll.c config.c users.c hashtable.c dbusers.c thread.c gwbitmask.c monitor.c adminusers.c secrets.c filter.c modutil.c hint.c housekeeper.c memlog.c resultset.c gwdirs.c externcmd.c random_jkiss.c maxscale_pcre2.c) -add_dependencies(maxscale pcre2) +# add_dependencies(maxscale pcre2) +set_target_properties(maxscale PROPERTIES CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) +set_target_properties(maxscale PROPERTIES CMAKE_INSTALL_RPATH_USE_LINK_PATH FALSE) +if(APPLE) + set_target_properties(maxscale PROPERTIES INSTALL_RPATH @loader_path/../${MAXSCALE_LIBDIR}) +else(APPLE) + set_target_properties(maxscale PROPERTIES INSTALL_RPATH $ORIGIN/../${MAXSCALE_LIBDIR}) +endif(APPLE) if(WITH_JEMALLOC) target_link_libraries(maxscale ${JEMALLOC_LIBRARIES}) @@ -26,10 +33,24 @@ target_link_libraries(maxscale ${LZMA_LINK_FLAGS} ${PCRE2_LIBRARIES} ${EMBEDDED_ install(TARGETS maxscale DESTINATION ${MAXSCALE_BINDIR}) add_executable(maxkeys maxkeys.c spinlock.c secrets.c utils.c gwdirs.c random_jkiss.c ${CMAKE_SOURCE_DIR}/log_manager/log_manager.cc) +set_target_properties(maxkeys PROPERTIES CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) +set_target_properties(maxkeys PROPERTIES CMAKE_INSTALL_RPATH_USE_LINK_PATH FALSE) +if(APPLE) + set_target_properties(maxkeys PROPERTIES INSTALL_RPATH @loader_path/../${MAXSCALE_LIBDIR}) +else(APPLE) + set_target_properties(maxkeys PROPERTIES INSTALL_RPATH $ORIGIN/../${MAXSCALE_LIBDIR}) +endif(APPLE) target_link_libraries(maxkeys utils pthread crypt crypto ${PCRE2_LIBRARIES}) install(TARGETS maxkeys DESTINATION ${MAXSCALE_BINDIR}) add_executable(maxpasswd maxpasswd.c spinlock.c secrets.c utils.c gwdirs.c random_jkiss.c ${CMAKE_SOURCE_DIR}/log_manager/log_manager.cc) +set_target_properties(maxpasswd PROPERTIES CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) +set_target_properties(maxpasswd PROPERTIES CMAKE_INSTALL_RPATH_USE_LINK_PATH FALSE) +if(APPLE) + set_target_properties(maxpasswd PROPERTIES INSTALL_RPATH @loader_path/../${MAXSCALE_LIBDIR}) +else(APPLE) + set_target_properties(maxpasswd PROPERTIES INSTALL_RPATH $ORIGIN/../${MAXSCALE_LIBDIR}) +endif(APPLE) target_link_libraries(maxpasswd utils pthread crypt crypto ${PCRE2_LIBRARIES}) install(TARGETS maxpasswd DESTINATION ${MAXSCALE_BINDIR}) diff --git a/server/inih/CMakeLists.txt b/server/inih/CMakeLists.txt index 11c3732..982bd50 100644 --- a/server/inih/CMakeLists.txt +++ b/server/inih/CMakeLists.txt @@ -1,2 +1,4 @@ add_definitions(-DINI_MAX_LINE=1024 -DINI_ALLOW_MULTILINE) add_library(inih ini.c) +set_target_properties(inih PROPERTIES VERSION "0.0.0") +install(TARGETS inih DESTINATION ${MAXSCALE_LIBDIR}) diff --git a/server/modules/filter/CMakeLists.txt b/server/modules/filter/CMakeLists.txt index a30aecb..ff16b34 100644 --- a/server/modules/filter/CMakeLists.txt +++ b/server/modules/filter/CMakeLists.txt @@ -3,7 +3,7 @@ if(BUILD_RABBITMQ) include_directories(${RABBITMQ_HEADERS}) add_library(mqfilter SHARED mqfilter.c) target_link_libraries(mqfilter query_classifier log_manager ${RABBITMQ_LIBRARIES}) - add_dependencies(mqfilter pcre2) + # add_dependencies(mqfilter pcre2) install(TARGETS mqfilter DESTINATION ${MAXSCALE_LIBDIR}) else() message(WARNING "Could not find librabbitmq, the mqfilter will not be built.") @@ -12,7 +12,7 @@ endif() add_library(regexfilter SHARED regexfilter.c) target_link_libraries(regexfilter log_manager) -add_dependencies(regexfilter pcre2) +# add_dependencies(regexfilter pcre2) set_target_properties(regexfilter PROPERTIES VERSION "1.1.0") install(TARGETS regexfilter DESTINATION ${MAXSCALE_LIBDIR}) diff --git a/server/modules/filter/hint/CMakeLists.txt b/server/modules/filter/hint/CMakeLists.txt index 94c5bf5..109abca 100644 --- a/server/modules/filter/hint/CMakeLists.txt +++ b/server/modules/filter/hint/CMakeLists.txt @@ -1,4 +1,4 @@ add_library(hintfilter SHARED hintfilter.c hintparser.c) -set_target_properties(hintfilter PROPERTIES INSTALL_RPATH ${CMAKE_INSTALL_RPATH}:${MAXSCALE_LIBDIR} VERSION "1.0.0") +set_target_properties(hintfilter PROPERTIES VERSION "1.0.0") target_link_libraries(hintfilter ssl log_manager utils) install(TARGETS hintfilter DESTINATION ${MAXSCALE_LIBDIR}) diff --git a/server/modules/monitor/CMakeLists.txt b/server/modules/monitor/CMakeLists.txt index 604d944..f9e0f1e 100644 --- a/server/modules/monitor/CMakeLists.txt +++ b/server/modules/monitor/CMakeLists.txt @@ -1,25 +1,25 @@ add_library(mysqlmon SHARED mysql_mon.c) target_link_libraries(mysqlmon log_manager) -add_dependencies(mysqlmon pcre2) +# add_dependencies(mysqlmon pcre2) set_target_properties(mysqlmon PROPERTIES VERSION "1.4.0") install(TARGETS mysqlmon DESTINATION ${MAXSCALE_LIBDIR}) add_library(galeramon SHARED galeramon.c) target_link_libraries(galeramon log_manager) -add_dependencies(galeramon pcre2) +# add_dependencies(galeramon pcre2) set_target_properties(galeramon PROPERTIES VERSION "2.0.0") install(TARGETS galeramon DESTINATION ${MAXSCALE_LIBDIR}) add_library(ndbclustermon SHARED ndbclustermon.c) target_link_libraries(ndbclustermon log_manager) -add_dependencies(ndbclustermon pcre2) +# add_dependencies(ndbclustermon pcre2) set_target_properties(ndbclustermon PROPERTIES VERSION "2.1.0") install(TARGETS ndbclustermon DESTINATION ${MAXSCALE_LIBDIR}) if(BUILD_MMMON) add_library(mmmon SHARED mmmon.c) target_link_libraries(mmmon log_manager) - add_dependencies(mmmon pcre2) + # add_dependencies(mmmon pcre2) set_target_properties(mmmon PROPERTIES VERSION "1.1.1") install(TARGETS mmmon DESTINATION ${MAXSCALE_LIBDIR}) endif() diff --git a/server/modules/routing/binlog/CMakeLists.txt b/server/modules/routing/binlog/CMakeLists.txt index 2b282ea..a21a7f6 100644 --- a/server/modules/routing/binlog/CMakeLists.txt +++ b/server/modules/routing/binlog/CMakeLists.txt @@ -1,5 +1,5 @@ add_library(binlogrouter SHARED blr.c blr_master.c blr_cache.c blr_slave.c blr_file.c) -set_target_properties(binlogrouter PROPERTIES INSTALL_RPATH ${CMAKE_INSTALL_RPATH}:${MAXSCALE_LIBDIR} VERSION "2.0.0") +set_target_properties(binlogrouter PROPERTIES VERSION "2.0.0") target_link_libraries(binlogrouter ssl pthread log_manager) install(TARGETS binlogrouter DESTINATION ${MAXSCALE_LIBDIR}) @@ -18,6 +18,13 @@ add_executable(maxbinlogcheck maxbinlogcheck.c blr_file.c blr_cache.c blr_master ${CMAKE_SOURCE_DIR}/server/core/thread.c ${CMAKE_SOURCE_DIR}/server/core/secrets.c ${CMAKE_SOURCE_DIR}/server/core/random_jkiss.c ${CMAKE_SOURCE_DIR}/server/core/maxscale_pcre2.c ${CMAKE_SOURCE_DIR}/log_manager/log_manager.cc ${CMAKE_SOURCE_DIR}/server/core/externcmd.c) +set_target_properties(maxbinlogcheck PROPERTIES CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) +set_target_properties(maxbinlogcheck PROPERTIES CMAKE_INSTALL_RPATH_USE_LINK_PATH FALSE) +if(APPLE) + set_target_properties(maxbinlogcheck PROPERTIES INSTALL_RPATH @loader_path/../${MAXSCALE_LIBDIR}) +else(APPLE) + set_target_properties(maxbinlogcheck PROPERTIES INSTALL_RPATH $ORIGIN/../${MAXSCALE_LIBDIR}) +endif(APPLE) target_link_libraries(maxbinlogcheck utils ssl pthread ${LZMA_LINK_FLAGS} ${EMBEDDED_LIB} ${PCRE_LINK_FLAGS} aio rt crypt dl crypto inih z m stdc++ ${CURL_LIBRARIES} ${PCRE2_LIBRARIES}) diff --git a/server/modules/routing/maxinfo/CMakeLists.txt b/server/modules/routing/maxinfo/CMakeLists.txt index 55d0c7c..6812110 100644 --- a/server/modules/routing/maxinfo/CMakeLists.txt +++ b/server/modules/routing/maxinfo/CMakeLists.txt @@ -1,4 +1,4 @@ add_library(maxinfo SHARED maxinfo.c maxinfo_parse.c maxinfo_error.c maxinfo_exec.c) -set_target_properties(maxinfo PROPERTIES INSTALL_RPATH ${CMAKE_INSTALL_RPATH}:${MAXSCALE_LIBDIR} VERSION "1.0.0") +set_target_properties(maxinfo PROPERTIES VERSION "1.0.0") target_link_libraries(maxinfo pthread log_manager) install(TARGETS maxinfo DESTINATION ${MAXSCALE_LIBDIR}) diff --git a/server/modules/routing/schemarouter/CMakeLists.txt b/server/modules/routing/schemarouter/CMakeLists.txt index 975143c..f297e36 100644 --- a/server/modules/routing/schemarouter/CMakeLists.txt +++ b/server/modules/routing/schemarouter/CMakeLists.txt @@ -1,12 +1,12 @@ add_library(schemarouter SHARED schemarouter.c sharding_common.c) target_link_libraries(schemarouter log_manager query_classifier) -add_dependencies(schemarouter pcre2) +# add_dependencies(schemarouter pcre2) set_target_properties(schemarouter PROPERTIES VERSION "1.0.0") install(TARGETS schemarouter DESTINATION ${MAXSCALE_LIBDIR}) add_library(shardrouter SHARED shardrouter.c svcconn.c sharding_common.c) target_link_libraries(shardrouter log_manager query_classifier) -add_dependencies(shardrouter pcre2) +# add_dependencies(shardrouter pcre2) set_target_properties(shardrouter PROPERTIES VERSION "1.0.0") install(TARGETS shardrouter DESTINATION ${MAXSCALE_LIBDIR}) diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt index 8bba56e..05793f8 100644 --- a/utils/CMakeLists.txt +++ b/utils/CMakeLists.txt @@ -1,3 +1,5 @@ -add_library(utils skygw_utils.cc ../server/core/atomic.c) -target_link_libraries(utils stdc++) -add_dependencies(utils pcre2) +add_library(utils skygw_utils.cc ../server/core/atomic.c ../server/core/random_jkiss.c ../server/core/spinlock.c) +target_link_libraries(utils stdc++ pcre2-8 pthread) +# add_dependencies(utils pcre2) +set_target_properties(utils PROPERTIES VERSION "0.0.0") +install(TARGETS utils DESTINATION ${MAXSCALE_LIBDIR})
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
