Commit 4bfa7af2 authored by Jonathan Perkin's avatar Jonathan Perkin

Fix socket path in RPMs. XXX should be put into cmake/* somewhere.

parent 7ef2f9fa
...@@ -372,16 +372,20 @@ mkdir debug ...@@ -372,16 +372,20 @@ mkdir debug
-e 's/ -ip / /' \ -e 's/ -ip / /' \
-e 's/^ //' \ -e 's/^ //' \
-e 's/ $//'` -e 's/ $//'`
# XXX: MYSQL_UNIX_ADDR should be in cmake/* but mysql_version is included before
# XXX: install_layout so we can't just set it based on INSTALL_LAYOUT=RPM
${CMAKE} ../%{src_dir} -DBUILD_CONFIG=mysql_release -DINSTALL_LAYOUT=RPM \ ${CMAKE} ../%{src_dir} -DBUILD_CONFIG=mysql_release -DINSTALL_LAYOUT=RPM \
-DCMAKE_BUILD_TYPE=Debug -DMYSQL_UNIX_ADDR="/var/lib/mysql/mysql.sock" -DCMAKE_BUILD_TYPE=Debug
make VERBOSE=1 mysqld mysqlserver make VERBOSE=1 mysqld mysqlserver
) )
# Build full release # Build full release
mkdir release mkdir release
( (
cd release cd release
# XXX: MYSQL_UNIX_ADDR should be in cmake/* but mysql_version is included before
# XXX: install_layout so we can't just set it based on INSTALL_LAYOUT=RPM
${CMAKE} ../%{src_dir} -DBUILD_CONFIG=mysql_release -DINSTALL_LAYOUT=RPM \ ${CMAKE} ../%{src_dir} -DBUILD_CONFIG=mysql_release -DINSTALL_LAYOUT=RPM \
-DCMAKE_BUILD_TYPE=RelWithDebInfo -DMYSQL_UNIX_ADDR="/var/lib/mysql/mysql.sock" -DCMAKE_BUILD_TYPE=RelWithDebInfo
make VERBOSE=1 make VERBOSE=1
) )
......
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