diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-06-06 14:15:29 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-06-06 14:15:29 +0200 |
| commit | 38c4ef63b862fd59b4285fc3bfd9f5dff536649d (patch) | |
| tree | d3717570d38fd0c19d5bd9bb23b12134aa5a5e3a /debian | |
| parent | b14d3adad9d10a8575bebca7e7af0ff7ef9f71b1 (diff) | |
| download | mariadb-git-38c4ef63b862fd59b4285fc3bfd9f5dff536649d.tar.gz | |
MDEV-302 lp:988204 MariaDB 5.5.23 binaries don't use libaio
simplify debian/dist/*/rules slightly.
move hard-coded config value to cmake files.
(the actual fix is -DBUILD_CONFIG=mysql_release)
Diffstat (limited to 'debian')
| -rwxr-xr-x | debian/dist/Debian/rules | 23 | ||||
| -rwxr-xr-x | debian/dist/Ubuntu/rules | 23 |
2 files changed, 4 insertions, 42 deletions
diff --git a/debian/dist/Debian/rules b/debian/dist/Debian/rules index 5cb22ae60d6..96ad527542d 100755 --- a/debian/dist/Debian/rules +++ b/debian/dist/Debian/rules @@ -70,30 +70,11 @@ endif CXX=$${MYSQL_BUILD_CXX:-g++} \ CXXFLAGS=$${MYSQL_BUILD_CXXFLAGS:-"-O2 -fno-omit-frame-pointer -g -pipe -Wall -Wno-uninitialized"} \ cmake .. \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DINSTALL_SBINDIR=sbin \ - -DMYSQL_DATADIR=/var/lib/mysql \ - -DINSTALL_INCLUDEDIR=include/mysql \ - -DINSTALL_INFODIR=share/info \ - -DINSTALL_MANDIR=share/man \ - \ -DMYSQL_SERVER_SUFFIX="-$(DEBVERSION)" \ + -DBUILD_CONFIG=mysql_release \ -DCOMPILATION_COMMENT="mariadb.org binary distribution" \ -DSYSTEM_TYPE="debian-linux-gnu" \ - -DINSTALL_LAYOUT=DEB \ - \ - -DENABLED_LOCAL_INFILE=1 \ - -DWITH_FAST_MUTEXES=1 \ - \ - -DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock \ - \ - -DEXTRA_CHARSETS=all \ - -DWITH_LIBWRAP=1 \ - -DWITH_SSL=system \ - -DWITH_ZLIB=system \ - -DWITH_EMBEDDED_SERVER=1 \ - -DHAVE_EMBEDDED_PRIVILEGE_CONTROL=ON \ - -DWITH_MAX=1' + -DDEB=debian' touch $@ diff --git a/debian/dist/Ubuntu/rules b/debian/dist/Ubuntu/rules index 592b2e4d7d1..bb413ad83cc 100755 --- a/debian/dist/Ubuntu/rules +++ b/debian/dist/Ubuntu/rules @@ -70,30 +70,11 @@ endif CXX=$${MYSQL_BUILD_CXX:-g++} \ CXXFLAGS=$${MYSQL_BUILD_CXXFLAGS:-"-O2 -fno-omit-frame-pointer -g -pipe -Wall -Wno-uninitialized"} \ cmake .. \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DINSTALL_SBINDIR=sbin \ - -DMYSQL_DATADIR=/var/lib/mysql \ - -DINSTALL_INCLUDEDIR=include/mysql \ - -DINSTALL_INFODIR=share/info \ - -DINSTALL_MANDIR=share/man \ - \ -DMYSQL_SERVER_SUFFIX="-$(DEBVERSION)" \ + -DBUILD_CONFIG=mysql_release \ -DCOMPILATION_COMMENT="mariadb.org binary distribution" \ -DSYSTEM_TYPE="debian-linux-gnu" \ - -DINSTALL_LAYOUT=DEB \ - \ - -DENABLED_LOCAL_INFILE=1 \ - -DWITH_FAST_MUTEXES=1 \ - \ - -DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock \ - \ - -DEXTRA_CHARSETS=all \ - -DWITH_LIBWRAP=1 \ - -DWITH_SSL=system \ - -DWITH_ZLIB=system \ - -DWITH_EMBEDDED_SERVER=1 \ - -DHAVE_EMBEDDED_PRIVILEGE_CONTROL=ON \ - -DWITH_MAX=1' + -DDEB=ubuntu' touch $@ |