Commit eca8a74a authored by Jonathan Perkin's avatar Jonathan Perkin

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

Remove libmysqld-debug.a, it doesn't exist in current packages?
parent 4bfa7af2
...@@ -171,6 +171,7 @@ IF(UNIX) ...@@ -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)
......
...@@ -440,11 +440,6 @@ install -d $RBR%{_sbindir} ...@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment