Magellan Linux

Diff of /smage/trunk/core/mariadb/mariadb-10.1.25-r1.smage2

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 9666 by niro, Wed Aug 2 13:42:13 2017 UTC revision 9667 by niro, Wed Aug 2 13:46:14 2017 UTC
# Line 154  src_compile() Line 154  src_compile()
154   $(cmake_with EMBEDDED_SERVER) \   $(cmake_with EMBEDDED_SERVER) \
155   $(cmake_with INNOBASE_STORAGE_ENGINE 1) \   $(cmake_with INNOBASE_STORAGE_ENGINE 1) \
156   $(cmake_with PARTITION_STORAGE_ENGINE 1) \   $(cmake_with PARTITION_STORAGE_ENGINE 1) \
157   $(cmake_with EXAMPLE_STORAGE_ENGINE 0) \   $(cmake_without EXAMPLE_STORAGE_ENGINE) \
158   $(cmake_with ARCHIVE_STORAGE_ENGINE 0) \   $(cmake_without ARCHIVE_STORAGE_ENGINE) \
159   $(cmake_with BLACKHOLE_STORAGE_ENGINE 0) \   $(cmake_without BLACKHOLE_STORAGE_ENGINE) \
160   $(cmake_with FEDERATED_STORAGE_ENGINE 0) \   $(cmake_without FEDERATED_STORAGE_ENGINE) \
161   $(cmake_without UNIT_TESTS) \   $(cmake_without UNIT_TESTS) \
162   $(cmake_without TOKUDB) \   $(cmake_without TOKUDB) \
163   $(cmake_without OQGRAPH) \   $(cmake_without OQGRAPH) \
164   -DCMAKE_EXE_LINKER_FLAGS='-ljemalloc -latomic' \   -DCMAKE_EXE_LINKER_FLAGS='-ljemalloc' \
165   -DWITH_MYSQLD_LDFLAGS="-pie ${LDFLAGS},-z,now" \   -DWITH_MYSQLD_LDFLAGS="-pie ${LDFLAGS},-z,now" \
166   || die   || die
167    

Legend:
Removed from v.9666  
changed lines
  Added in v.9667