diff options
| author | Igor Pashev <pashev.igor@gmail.com> | 2017-10-02 17:47:52 +0300 |
|---|---|---|
| committer | Igor Pashev <pashev.igor@gmail.com> | 2017-10-02 17:47:56 +0300 |
| commit | 12feb4442be71b05d8fdb1bb04add1e88e30e0b1 (patch) | |
| tree | b04bd029f7d5508ee0fe59c0a0378a6c2c0e6437 | |
| parent | f0a40cb757000a83e37185d45423280351f3aa69 (diff) | |
| download | mariadb-10.1-12feb4442be71b05d8fdb1bb04add1e88e30e0b1.tar.gz | |
Disable jemalloc on Dyson
Server crashes. So it does with mkmalloc.
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | debian/patches/dyson.patch | 15 | ||||
| -rwxr-xr-x | debian/rules | 2 |
3 files changed, 17 insertions, 2 deletions
diff --git a/debian/control b/debian/control index 7608c6a..410027e 100644 --- a/debian/control +++ b/debian/control @@ -19,7 +19,7 @@ Build-Depends: bison, libarchive-dev, libboost-dev, libcrack2-dev (>= 2.9.0), - libjemalloc-dev [!kfreebsd-any !hurd-any !mips !mipsel !mips64 !mips64el], + libjemalloc-dev [!illumos-amd64 !kfreebsd-any !hurd-any !mips !mipsel !mips64 !mips64el], libjudy-dev, libkrb5-dev, libncurses5-dev (>= 5.0-6~), diff --git a/debian/patches/dyson.patch b/debian/patches/dyson.patch index 8721c1b..dff8ecc 100644 --- a/debian/patches/dyson.patch +++ b/debian/patches/dyson.patch @@ -51,3 +51,18 @@ Index: mariadb-10.1-10.1.26/storage/connect/tabvct.cpp /***********************************************************************/ /* External function. */ /***********************************************************************/ +Index: mariadb-10.1-10.1.26/cmake/build_configurations/mysql_release.cmake +=================================================================== +--- mariadb-10.1-10.1.26.orig/cmake/build_configurations/mysql_release.cmake ++++ mariadb-10.1-10.1.26/cmake/build_configurations/mysql_release.cmake +@@ -229,10 +229,6 @@ IF(UNIX) + + # Solaris flags + IF(CMAKE_SYSTEM_NAME MATCHES "SunOS") +- IF(CMAKE_SYSTEM_VERSION VERSION_GREATER "5.9") +- # Link mysqld with mtmalloc on Solaris 10 and later +- SET(WITH_MYSQLD_LDFLAGS "-lmtmalloc" CACHE STRING "") +- ENDIF() + IF(CMAKE_C_COMPILER_ID MATCHES "SunPro") + IF(CMAKE_SYSTEM_PROCESSOR MATCHES "i386") + SET(COMMON_C_FLAGS "-g -mt -fsimple=1 -ftrap=%none -nofstore -xbuiltin=%all -xlibmil -xlibmopt -xtarget=generic") diff --git a/debian/rules b/debian/rules index 758bf4c..e5935bf 100755 --- a/debian/rules +++ b/debian/rules @@ -42,7 +42,7 @@ ifneq ($(DEB_HOST_ARCH),amd64) endif # Disable jemalloc on mips* due to #843926 -ifneq (,$(filter $(DEB_HOST_ARCH), mips mipsel mips64 mips64el)) +ifneq (,$(filter $(DEB_HOST_ARCH), illumos-amd64 mips mipsel mips64 mips64el)) CMAKEFLAGS += -DWITH_JEMALLOC=no endif |