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 9646 by niro, Tue Aug 1 10:33:43 2017 UTC revision 9647 by niro, Tue Aug 1 11:29:22 2017 UTC
# Line 18  COMMON_DEPEND=">= sys-libs/zlib-1.2 Line 18  COMMON_DEPEND=">= sys-libs/zlib-1.2
18   >= dev-libs/libpcre-8.41   >= dev-libs/libpcre-8.41
19   >= dev-libs/libxml2-2.9   >= dev-libs/libxml2-2.9
20   >= dev-libs/jemalloc-5   >= dev-libs/jemalloc-5
21   >= dev-libs/libevent-2"   >= dev-libs/libaio-0.3
22  # >= sys-libs/libatomic-6.3   >= dev-libs/libevent-2
23  # >= dev-libs/libaio-0.3   >= sys-libs/libatomic-6.3"
24    
25  ALX_DEV_DEPEND=">= sys-libs/zlib-dev-1.2  ALX_DEV_DEPEND=">= sys-libs/zlib-dev-1.2
26   >= sys-libs/ncurses-dev-6.0   >= sys-libs/ncurses-dev-6.0
# Line 28  ALX_DEV_DEPEND=">= sys-libs/zlib-dev-1.2 Line 28  ALX_DEV_DEPEND=">= sys-libs/zlib-dev-1.2
28   >= dev-libs/libpcre-dev-8.41   >= dev-libs/libpcre-dev-8.41
29   >= dev-libs/libxml2-dev-2.9   >= dev-libs/libxml2-dev-2.9
30   >= dev-libs/jemalloc-dev-5   >= dev-libs/jemalloc-dev-5
31   >= dev-libs/libevent-dev-2"   >= dev-libs/libaio-dev-0.3
32  # >= sys-libs/libatomic-dev-6.3   >= dev-libs/libevent-dev-2
33  # >= dev-libs/libaio-dev-0.3   >= sys-libs/libatomic-dev-6.3"
34    
35  SDEPEND="${ALX_DEV_DEPEND}  SDEPEND="${ALX_DEV_DEPEND}
36   ${COMMON_DEPEND}   ${COMMON_DEPEND}
# Line 114  src_compile() Line 114  src_compile()
114   export CFLAGS="${CFLAGS} -fPIC"   export CFLAGS="${CFLAGS} -fPIC"
115   export CXXFLAGS="${CXXFLAGS} -fPIC"   export CXXFLAGS="${CXXFLAGS} -fPIC"
116    
117  # # fix issues with missing -latomic   # fix issues with missing -latomic
118  # export LDFLAGS+=" -latomic"   export LDFLAGS+=" -latomic"
119    
120   cmake_configure \   cmake_configure \
121   -DWITH_COMMENT="Magellan MariaDB ${PVER}-${PBUILD}" \   -DWITH_COMMENT="Magellan MariaDB ${PVER}-${PBUILD}" \

Legend:
Removed from v.9646  
changed lines
  Added in v.9647