diff options
| author | Florian Smeets <flo@FreeBSD.org> | 2013-06-07 15:05:38 +0000 |
|---|---|---|
| committer | Florian Smeets <flo@FreeBSD.org> | 2013-06-07 15:05:38 +0000 |
| commit | 6fd6d4dccb205bcb4ad7d22db5bf955025eee9c5 (patch) | |
| tree | 9609fa86adf2f57333664014c0a08c2428149276 /databases/percona56-server/files/patch-libmysql_CMakeLists.txt | |
| parent | 64eed4ceaa75b6fe41446f3742c8c94a478b1b27 (diff) | |
| download | ports-6fd6d4dccb205bcb4ad7d22db5bf955025eee9c5.tar.gz ports-6fd6d4dccb205bcb4ad7d22db5bf955025eee9c5.zip | |
Update to 5.6.11-rc60.3
Notes
Notes:
svn path=/head/; revision=320208
Diffstat (limited to 'databases/percona56-server/files/patch-libmysql_CMakeLists.txt')
| -rw-r--r-- | databases/percona56-server/files/patch-libmysql_CMakeLists.txt | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/databases/percona56-server/files/patch-libmysql_CMakeLists.txt b/databases/percona56-server/files/patch-libmysql_CMakeLists.txt index 7f11bedc9e43..c34140546d2f 100644 --- a/databases/percona56-server/files/patch-libmysql_CMakeLists.txt +++ b/databases/percona56-server/files/patch-libmysql_CMakeLists.txt @@ -1,9 +1,9 @@ ---- libmysql/CMakeLists.txt.orig 2010-12-03 18:58:26.000000000 +0100 -+++ libmysql/CMakeLists.txt 2010-12-23 22:01:37.000000000 +0100 -@@ -153,13 +153,14 @@ +--- libmysql/CMakeLists.txt.orig 2013-06-03 00:02:34.000000000 +0200 ++++ libmysql/CMakeLists.txt 2013-06-06 00:54:32.603753815 +0200 +@@ -173,13 +173,14 @@ + ENDIF() # Merge several convenience libraries into one big mysqlclient - # and link them together into shared library. -MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development) +MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development NOINSTALL) @@ -16,20 +16,24 @@ IF(UNIX) MACRO(GET_VERSIONED_LIBNAME LIBNAME EXTENSION VERSION OUTNAME) SET(DOT_VERSION ".${VERSION}") -@@ -174,9 +175,11 @@ +@@ -194,13 +195,15 @@ ENDMACRO() INSTALL_SYMLINK(${CMAKE_STATIC_LIBRARY_PREFIX}mysqlclient_r.a mysqlclient ${INSTALL_LIBDIR} Development) ENDIF() +ENDIF() IF(NOT DISABLE_SHARED) -- MERGE_LIBRARIES(libmysql SHARED ${LIBS} EXPORTS ${CLIENT_API_FUNCTIONS} COMPONENT SharedLibraries) -+ MERGE_LIBRARIES(libmysql SHARED ${LIBS} EXPORTS ${CLIENT_API_FUNCTIONS} COMPONENT SharedLibraries NOINSTALL) + # Merge several convenience libraries into one big mysqlclient + # and link them together into shared library. + MERGE_LIBRARIES(libmysql SHARED ${LIBS} + EXPORTS ${CLIENT_API_FUNCTIONS} +- COMPONENT SharedLibraries) ++ COMPONENT SharedLibraries NOINSTALL) +IF(FALSE) IF(UNIX) # libtool compatability IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE) -@@ -223,3 +226,4 @@ +@@ -252,3 +255,4 @@ ENDFOREACH() ENDIF() ENDIF() |