1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-09 22:24:09 +03:00

Put back libmysqlclient_r.a, not sure it was supposed to be removed.

Remove libmysqld-debug.a, it doesn't exist in current packages?
This commit is contained in:
Jonathan Perkin
2010-03-31 19:04:22 +02:00
parent 4bfa7af22d
commit eca8a74a3e
2 changed files with 1 additions and 5 deletions

View File

@@ -171,6 +171,7 @@ IF(UNIX)
SET(${OUTNAME} ${LIBNAME}${EXTENSION}${DOT_VERSION}) SET(${OUTNAME} ${LIBNAME}${EXTENSION}${DOT_VERSION})
ENDIF() ENDIF()
ENDMACRO() ENDMACRO()
INSTALL_SYMLINK(${CMAKE_STATIC_LIBRARY_PREFIX}mysqlclient_r mysqlclient ${INSTALL_LIBDIR})
ENDIF() ENDIF()
IF(NOT DISABLE_SHARED) IF(NOT DISABLE_SHARED)

View File

@@ -440,11 +440,6 @@ install -d $RBR%{_sbindir}
make DESTDIR=$RBR install 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: 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: directly into %{_libdir}/mysql - perhaps at the same time as renaming
# FIXME: the shared libraries to use libmysql*-$major.$minor.so syntax # FIXME: the shared libraries to use libmysql*-$major.$minor.so syntax