diff options
| author | Andrei Karas <akaras@inbox.ru> | 2015-01-05 00:29:55 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2015-08-05 17:47:13 +0300 |
| commit | 6ef633913224d860a739c7be82a59a346774250e (patch) | |
| tree | 03363b10400bf85165ff8e2065a224e13a7e5c14 | |
| parent | 347ba23126a8d1474fdac3873476bbad87fcc836 (diff) | |
| download | hercules-6ef633913224d860a739c7be82a59a346774250e.tar.gz hercules-6ef633913224d860a739c7be82a59a346774250e.tar.bz2 hercules-6ef633913224d860a739c7be82a59a346774250e.tar.xz hercules-6ef633913224d860a739c7be82a59a346774250e.zip | |
In build script fix building with new mariadb.
| -rwxr-xr-x | build.sh | 14 |
1 files changed, 8 insertions, 6 deletions
@@ -6,34 +6,36 @@ if [[ -z "${CMD}" ]]; then export CMD="default" fi +export COMMON="--disable-lto --enable-packetver=20150000 --enable-debug=gdb --with-mysql=/usr/bin/mariadb_config" + autoreconf if [[ "${CMD}" == "default" || "${CMD}" == "all" ]]; then - ./configure --enable-sanitize --disable-lto --enable-packetver=20150000 --enable-debug=gdb + ./configure --enable-sanitize ${COMMON} make -j3 make install cd src/evol ./build.sh elif [[ "${CMD}" == "old" ]]; then - ./configure --disable-lto --enable-packetver=20150000 --enable-debug=gdb + ./configure ${COMMON} make -j3 make install cd src/evol ./build.sh old elif [[ "${CMD}" == "valgrind" ]]; then - ./configure --disable-lto --enable-packetver=20150000 --enable-debug=gdb --enable-manager=no + ./configure --enable-manager=no ${COMMON} make -j3 make install cd src/evol ./build.sh old elif [[ "${CMD}" == "server" ]]; then - ./configure --enable-sanitize --disable-lto --enable-packetver=20150000 --enable-debug=gdb + ./configure --enable-sanitize ${COMMON} make -j3 make install elif [[ "${CMD}" == "static" ]]; then - ./configure LIBS="-lmysqlclient -lssl -lcrypto -pthread -lm -lz" --disable-64bit --enable-static --disable-lto --enable-packetver=20150000 --enable-debug=gdb + ./configure LIBS="-lmysqlclient -lssl -lcrypto -pthread -lm -lz" --disable-64bit --enable-static ${COMMON} make -j3 elif [[ "${CMD}" == "static64" ]]; then - ./configure --enable-static --disable-lto --enable-packetver=20150000 --enable-debug=gdb + ./configure --enable-static ${COMMON} make -j3 fi exit $? |