diff options
| author | Vasil Dimov <vd@FreeBSD.org> | 2019-11-02 15:18:26 +0000 |
|---|---|---|
| committer | Vasil Dimov <vd@FreeBSD.org> | 2019-11-02 15:18:26 +0000 |
| commit | f183749b1c71c5f1c3763b3d2b2f11a497b11f5f (patch) | |
| tree | 69fddc35094cc12931115080d9bc9fb7de897268 /databases/mysqlwsrep56-server/files/patch-libmysql_CMakeLists.txt | |
| parent | Update patches imported from asterisk project to latest version. (diff) | |
databases/mysqlwsrep56-server: upgrade 5.6.45-25.27 -> 5.6.46-25.28
PR: 241533
Submitted by: Teemu Ollakka <teemu.ollakka@galeracluster.com>
Relnotes: http://releases.galeracluster.com/mysql-wsrep-5.6.46-25.28/release-notes-mysql-wsrep-5.6.46-25.28.txt
Diffstat (limited to 'databases/mysqlwsrep56-server/files/patch-libmysql_CMakeLists.txt')
| -rw-r--r-- | databases/mysqlwsrep56-server/files/patch-libmysql_CMakeLists.txt | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/databases/mysqlwsrep56-server/files/patch-libmysql_CMakeLists.txt b/databases/mysqlwsrep56-server/files/patch-libmysql_CMakeLists.txt index 7e4e2e99af49..6811d02c853d 100644 --- a/databases/mysqlwsrep56-server/files/patch-libmysql_CMakeLists.txt +++ b/databases/mysqlwsrep56-server/files/patch-libmysql_CMakeLists.txt @@ -1,19 +1,19 @@ ---- libmysql/CMakeLists.txt.orig 2017-01-25 07:58:07 UTC +--- libmysql/CMakeLists.txt.orig 2019-10-21 05:17:49 UTC +++ libmysql/CMakeLists.txt -@@ -180,7 +180,7 @@ IF(WIN32) +@@ -205,7 +205,7 @@ IF(WIN32) ENDIF() # Merge several convenience libraries into one big mysqlclient --MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development) -+MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development NOINSTALL) +-MERGE_LIBRARIES(mysqlclient STATIC ${LIBS_TO_MERGE} COMPONENT Development) ++MERGE_LIBRARIES(mysqlclient STATIC ${LIBS_TO_MERGE} COMPONENT Development NOINSTALL) + TARGET_LINK_LIBRARIES(mysqlclient ${LIBS_TO_LINK}) # Visual Studio users need debug static library for debug projects - IF(MSVC) -@@ -208,19 +208,22 @@ IF(UNIX) +@@ -234,19 +234,22 @@ IF(UNIX) ENDMACRO() ENDIF() -+IF(FALSE) ++IF (FALSE) IF(UNIX) GET_TARGET_NAME(mysqlclient lib_name) INSTALL_SYMLINK(mysqlclient @@ -25,15 +25,15 @@ IF(NOT DISABLE_SHARED) # Merge several convenience libraries into one big mysqlclient # and link them together into shared library. - MERGE_LIBRARIES(libmysql SHARED ${LIBS} + MERGE_LIBRARIES(libmysql SHARED ${LIBS_TO_MERGE} EXPORTS ${CLIENT_API_FUNCTIONS} - COMPONENT SharedLibraries) + COMPONENT SharedLibraries NOINSTALL) -+ IF(FALSE) ++ IF (FALSE) + TARGET_LINK_LIBRARIES(libmysql ${LIBS_TO_LINK}) IF(UNIX) # libtool compatability - IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE) -@@ -289,4 +292,5 @@ IF(NOT DISABLE_SHARED) +@@ -316,4 +319,5 @@ IF(NOT DISABLE_SHARED) ${INSTALL_LIBDIR} SharedLibraries) ENDFOREACH() ENDIF() |