diff options
Diffstat (limited to 'databases/mysql55-client/patches/patch-libmysql_CMakeLists.txt')
| -rw-r--r-- | databases/mysql55-client/patches/patch-libmysql_CMakeLists.txt | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/databases/mysql55-client/patches/patch-libmysql_CMakeLists.txt b/databases/mysql55-client/patches/patch-libmysql_CMakeLists.txt index eb744c0b05b..419a7c3b302 100644 --- a/databases/mysql55-client/patches/patch-libmysql_CMakeLists.txt +++ b/databases/mysql55-client/patches/patch-libmysql_CMakeLists.txt @@ -1,11 +1,11 @@ -$NetBSD: patch-libmysql_CMakeLists.txt,v 1.1 2013/12/15 18:45:19 asau Exp $ +$NetBSD: patch-libmysql_CMakeLists.txt,v 1.1.4.1 2014/04/14 15:29:21 tron Exp $ Use uniform shared library names to avoid packaging list divergence. ---- libmysql/CMakeLists.txt.orig 2013-11-05 07:19:26.000000000 +0000 -+++ libmysql/CMakeLists.txt 2013-12-15 17:49:19.435504292 +0000 -@@ -193,13 +193,13 @@ - MERGE_LIBRARIES(libmysql SHARED ${LIBS} EXPORTS ${CLIENT_API_FUNCTIONS} COMPONENT SharedLibraries) +--- libmysql/CMakeLists.txt.orig 2014-03-14 18:58:32.000000000 +0000 ++++ libmysql/CMakeLists.txt +@@ -207,14 +207,8 @@ IF(NOT DISABLE_SHARED) + COMPONENT SharedLibraries) IF(UNIX) # libtool compatability - IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE) @@ -13,14 +13,10 @@ Use uniform shared library names to avoid packaging list divergence. - ELSEIF(CMAKE_SYSTEM_NAME MATCHES "HP-UX") - SET(OS_SHARED_LIB_VERSION "${SHARED_LIB_MAJOR_VERSION}.0") - ELSE() -+# IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE) -+# SET(OS_SHARED_LIB_VERSION "${SHARED_LIB_MAJOR_VERSION}") -+# ELSEIF(CMAKE_SYSTEM_NAME MATCHES "HP-UX") -+# SET(OS_SHARED_LIB_VERSION "${SHARED_LIB_MAJOR_VERSION}.0") -+# ELSE() - SET(OS_SHARED_LIB_VERSION "${SHARED_LIB_MAJOR_VERSION}.0.0") +- SET(OS_SHARED_LIB_VERSION ++ SET(OS_SHARED_LIB_VERSION + "${SHARED_LIB_MAJOR_VERSION}.${SHARED_LIB_MINOR_VERSION}.0") - ENDIF() -+# ENDIF() # Name of shared library is mysqlclient on Unix SET_TARGET_PROPERTIES(libmysql PROPERTIES OUTPUT_NAME mysqlclient |