diff options
| author | Jonathan Perkin <jonathan.perkin@oracle.com> | 2010-03-31 19:04:22 +0200 |
|---|---|---|
| committer | Jonathan Perkin <jonathan.perkin@oracle.com> | 2010-03-31 19:04:22 +0200 |
| commit | eca8a74a3ec87fa1a5f0e1a54bab3c5df3cc108b (patch) | |
| tree | 51653e24eca921e3d237461a937aaa5e7c00ddc9 | |
| parent | 4bfa7af22d5430c39730a82052678e7d32299299 (diff) | |
| download | mariadb-git-eca8a74a3ec87fa1a5f0e1a54bab3c5df3cc108b.tar.gz | |
Put back libmysqlclient_r.a, not sure it was supposed to be removed.
Remove libmysqld-debug.a, it doesn't exist in current packages?
| -rwxr-xr-x | libmysql/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | support-files/mysql.spec.sh | 5 |
2 files changed, 1 insertions, 5 deletions
diff --git a/libmysql/CMakeLists.txt b/libmysql/CMakeLists.txt index 26af9c80a2b..d448f72b0c2 100755 --- a/libmysql/CMakeLists.txt +++ b/libmysql/CMakeLists.txt @@ -171,6 +171,7 @@ IF(UNIX) SET(${OUTNAME} ${LIBNAME}${EXTENSION}${DOT_VERSION}) ENDIF() ENDMACRO() + INSTALL_SYMLINK(${CMAKE_STATIC_LIBRARY_PREFIX}mysqlclient_r mysqlclient ${INSTALL_LIBDIR}) ENDIF() IF(NOT DISABLE_SHARED) diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index b31c7551951..c44181c2597 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -440,11 +440,6 @@ install -d $RBR%{_sbindir} make DESTDIR=$RBR install ) -# FIXME: kent attempted to have debug libmysqld.a installed automatically but -# FIXME: could not get it working, so do it manually for now -install -m 644 $MBD/debug/libmysqld/libmysqld.a \ - $RBR%{_libdir}/mysql/libmysqld-debug.a - # FIXME: at some point we should stop doing this and just install everything # FIXME: directly into %{_libdir}/mysql - perhaps at the same time as renaming # FIXME: the shared libraries to use libmysql*-$major.$minor.so syntax |