-
Notifications
You must be signed in to change notification settings - Fork 1.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
(#21910) mariadb-connector-c: add v3.3.8
* mariadb-connector-c: add v3.3.8 * mariadb-connector-c: fix "warnings as errors" handling * mariadb-connector-c: restore the fix-install-and-static-or-shared patch
- Loading branch information
Showing
7 changed files
with
139 additions
and
45 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
13 changes: 0 additions & 13 deletions
13
recipes/mariadb-connector-c/all/patches/3.1.19-0002-remove-wx-flag.patch
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
13 changes: 0 additions & 13 deletions
13
recipes/mariadb-connector-c/all/patches/3.3.3-0002-find-package-zstd.patch
This file was deleted.
Oops, something went wrong.
117 changes: 117 additions & 0 deletions
117
recipes/mariadb-connector-c/all/patches/3.3.8-0001-fix-install-and-static-or-shared.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,117 @@ | ||
| --- libmariadb/CMakeLists.txt | ||
| +++ libmariadb/CMakeLists.txt | ||
| @@ -414,7 +414,7 @@ | ||
| ENDIF() | ||
|
|
||
|
|
||
| -IF(CMAKE_VERSION VERSION_GREATER 2.8.7) | ||
| +IF(FALSE) | ||
| # CREATE OBJECT LIBRARY | ||
| ADD_LIBRARY(mariadb_obj OBJECT ${LIBMARIADB_SOURCES}) | ||
| IF(UNIX) | ||
| @@ -443,21 +443,24 @@ | ||
| "FILE_DESCRIPTION:Dynamic lib for client/server communication") | ||
| ENDIF() | ||
|
|
||
| +IF(NOT BUILD_SHARED_LIBS) | ||
| ADD_LIBRARY(mariadbclient STATIC ${MARIADB_OBJECTS} ${EMPTY_FILE}) | ||
| TARGET_LINK_LIBRARIES(mariadbclient ${SYSTEM_LIBS} ${CRYPTO_LIBS}) | ||
| - | ||
| +ELSE() | ||
| IF(UNIX) | ||
| ADD_LIBRARY(libmariadb SHARED ${libmariadb_RC} ${MARIADB_OBJECTS} ${EMPTY_FILE}) | ||
| SET_TARGET_PROPERTIES(libmariadb PROPERTIES COMPILE_FLAGS "${CMAKE_SHARED_LIBRARY_C_FLAGS}") | ||
| ELSE() | ||
| - ADD_LIBRARY(libmariadb SHARED ${libmariadb_RC} ${MARIADB_OBJECTS} mariadbclient.def) | ||
| + ADD_LIBRARY(libmariadb SHARED ${libmariadb_RC} ${MARIADB_OBJECTS} ${EMPTY_FILE} mariadbclient.def) | ||
| SET_TARGET_PROPERTIES(libmariadb PROPERTIES LINKER_LANGUAGE C) | ||
| ENDIF() | ||
|
|
||
| TARGET_LINK_LIBRARIES(libmariadb LINK_PRIVATE ${SYSTEM_LIBS} ${CRYPTO_LIBS}) | ||
|
|
||
| SIGN_TARGET(libmariadb) | ||
| - | ||
| +ENDIF() | ||
| + | ||
| +IF(BUILD_SHARED_LIBS) | ||
| IF(CMAKE_SYSTEM_NAME MATCHES "Linux" OR | ||
| CMAKE_SYSTEM_NAME MATCHES "kFreeBSD" OR | ||
| CMAKE_SYSTEM_NAME MATCHES "GNU") | ||
| @@ -466,11 +469,14 @@ | ||
| ENDIF() | ||
| SET_TARGET_PROPERTIES(libmariadb PROPERTIES LINK_FLAGS "${CC_BINARY_DIR}/libmariadb/mariadbclient.def") | ||
| ENDIF() | ||
| - | ||
| +ELSE() | ||
| SET_TARGET_PROPERTIES(mariadbclient PROPERTIES IMPORTED_INTERFACE_LINK_LIBRARIES "${SYSTEM_LIBS}") | ||
| +ENDIF() | ||
| +IF(BUILD_SHARED_LIBS) | ||
| SET_TARGET_PROPERTIES(libmariadb PROPERTIES IMPORTED_INTERFACE_LINK_LIBRARIES "${SYSTEM_LIBS}") | ||
|
|
||
| SET_TARGET_PROPERTIES(libmariadb PROPERTIES PREFIX "") | ||
| +ENDIF() | ||
|
|
||
| # | ||
| # Installation | ||
| @@ -490,11 +496,15 @@ | ||
| ENDIF() | ||
| ENDIF() | ||
|
|
||
| +IF(NOT BUILD_SHARED_LIBS) | ||
| create_symlink(libmariadb${CMAKE_STATIC_LIBRARY_SUFFIX} mariadbclient ${INSTALL_LIBDIR}) | ||
| - | ||
| +ENDIF() | ||
| + | ||
| +IF(BUILD_SHARED_LIBS) | ||
| SET_TARGET_PROPERTIES(libmariadb PROPERTIES VERSION | ||
| ${CPACK_PACKAGE_VERSION_MAJOR} | ||
| SOVERSION ${CPACK_PACKAGE_VERSION_MAJOR}) | ||
| +ELSE() | ||
|
|
||
| IF(NOT WIN32) | ||
| SET_TARGET_PROPERTIES(mariadbclient PROPERTIES OUTPUT_NAME "${LIBMARIADB_STATIC_NAME}") | ||
| @@ -502,20 +512,33 @@ | ||
|
|
||
| INSTALL(TARGETS mariadbclient | ||
| COMPONENT Development | ||
| - DESTINATION ${INSTALL_LIBDIR}) | ||
| + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} | ||
| + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} | ||
| + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) | ||
| +ENDIF() | ||
| + | ||
| +IF(BUILD_SHARED_LIBS) | ||
| IF(WIN32) | ||
| INSTALL(TARGETS libmariadb | ||
| COMPONENT SharedLibraries | ||
| - DESTINATION ${INSTALL_LIBDIR}) | ||
| + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} | ||
| + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} | ||
| + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) | ||
| ELSE() | ||
| # in cmake 3.12+ we can use | ||
| #INSTALL(TARGETS libmariadb LIBRARY DESTINATION ${INSTALL_LIBDIR} | ||
| # COMPONENT SharedLibraries NAMELINK_COMPONENT Development) | ||
| # but as long as we build on CentOS 7 with its cmake 2.8.12.2 we have to use | ||
| -INSTALL(TARGETS libmariadb LIBRARY DESTINATION ${INSTALL_LIBDIR} | ||
| - COMPONENT SharedLibraries NAMELINK_SKIP) | ||
| -INSTALL(TARGETS libmariadb LIBRARY DESTINATION ${INSTALL_LIBDIR} | ||
| - COMPONENT Development NAMELINK_ONLY) | ||
| +INSTALL(TARGETS libmariadb LIBRARY | ||
| + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} | ||
| + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} | ||
| + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} | ||
| + COMPONENT SharedLibraries) | ||
| +INSTALL(TARGETS libmariadb LIBRARY | ||
| + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} | ||
| + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} | ||
| + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} | ||
| + COMPONENT Development) | ||
| ENDIF() | ||
|
|
||
| IF(MSVC) | ||
| @@ -524,3 +547,4 @@ | ||
| CONFIGURATIONS Debug RelWithDebInfo | ||
| COMPONENT Development) | ||
| ENDIF() | ||
| +ENDIF() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,6 @@ | ||
| versions: | ||
| "3.3.8": | ||
| folder: all | ||
| "3.3.3": | ||
| folder: all | ||
| "3.1.19": | ||
|
|
||