diff options
| author | Alex Dupre <ale@FreeBSD.org> | 2010-12-27 15:02:38 +0000 |
|---|---|---|
| committer | Alex Dupre <ale@FreeBSD.org> | 2010-12-27 15:02:38 +0000 |
| commit | d9029c513982bd669b22c88b2f04cd4cfd5c201f (patch) | |
| tree | 7f5fb76f05a3aae44742dda07753ffe091a58bfd /databases/mysql55-server/files/patch-libmysql_CMakeLists.txt | |
| parent | - Update to 0.062 (diff) | |
Update MySQL to 5.5.8 GA release. Read UPDATING.
Major changes:
- new installation layout, resembling RPM packages:
- client = Client Utilities + Development Libraries + Shared components
- server = MySQL Server + Embedded
- new build system: cmake instead of autotools
- fewer port knobs
Expect various breakages, but if we are lucky this could become the new default
mysql port.
Diffstat (limited to 'databases/mysql55-server/files/patch-libmysql_CMakeLists.txt')
| -rw-r--r-- | databases/mysql55-server/files/patch-libmysql_CMakeLists.txt | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/databases/mysql55-server/files/patch-libmysql_CMakeLists.txt b/databases/mysql55-server/files/patch-libmysql_CMakeLists.txt new file mode 100644 index 000000000000..7f11bedc9e43 --- /dev/null +++ b/databases/mysql55-server/files/patch-libmysql_CMakeLists.txt @@ -0,0 +1,36 @@ +--- 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 @@ + + # 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) + + # Visual Studio users need debug static library for debug projects + IF(MSVC) + INSTALL_DEBUG_TARGET(mysqlclient DESTINATION ${INSTALL_LIBDIR}/debug) + ENDIF() + ++IF(FALSE) + IF(UNIX) + MACRO(GET_VERSIONED_LIBNAME LIBNAME EXTENSION VERSION OUTNAME) + SET(DOT_VERSION ".${VERSION}") +@@ -174,9 +175,11 @@ + 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) ++IF(FALSE) + IF(UNIX) + # libtool compatability + IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE) +@@ -223,3 +226,4 @@ + ENDFOREACH() + ENDIF() + ENDIF() ++ENDIF() |