/[alx-svn]/smage/trunk/core/mariadb/mariadb-10.1.29-r1.smage2

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

Parent Directory | Revision Log | View Patch Patch

-revision 11614 by niro,
Wed Dec 27 14:31:11 2017 UTC
+revision 11615 by niro,
Wed Dec 27 14:45:00 2017 UTC
 Line 11 
 HOMEPAGE="http://www.mariadb.org/"
  # oqgraph plugins requires boost only - disabled atm
  # >= dev-libs/boost-1.64
+ # used bundled pcre atm, our system pcre does not support
+ # PCRE_STACK_SIZE_OK - Failed
+ #	>= dev-libs/libpcre-8.41
  COMMON_DEPEND=">= sys-libs/zlib-1.2
  	>= sys-libs/ncurses-6.0
  	>= sys-libs/libstdc++-6.3
  	>= dev-libs/openssl-1.1
- 	>= dev-libs/libpcre-8.41
  	>= dev-libs/libxml2-2.9
  	>= dev-libs/jemalloc-5
  	>= dev-libs/libaio-0.3
  	>= dev-libs/libevent-2
  	>= sys-libs/libatomic-6.3"
+ #	>= dev-libs/libpcre-dev-8.41
  ALX_DEV_DEPEND=">= sys-libs/zlib-dev-1.2
  	>= sys-libs/ncurses-dev-6.0
  	>= dev-libs/openssl-dev-1.1
- 	>= dev-libs/libpcre-dev-8.41
  	>= dev-libs/libxml2-dev-2.9
  	>= dev-libs/jemalloc-dev-5
  	>= dev-libs/libaio-dev-0.3
-Line 53 
 SRC_URI=(
+Line 55 
 SRC_URI=(
  	mirror://mysql/mysqld.service
  	mirror://mysql/mysqld.socket
  	mirror://mysql/mysql-5.5.19-cnf-defaults.patch
+ 	mirror://${PNAME}/${PNAME}-10.1.28-openssl-1.1.patch
  )
  UP2DATE="updatecmd https://downloads.mariadb.org/ | grep -A6 -i 'stable.*GA' | grep Download | sed 's:.*\].*Download\ \([0-9].*\)\ Stable.*:\1:;q'"
-Line 91 
 src_prepare()
+Line 94 
 src_prepare()
  	munpack ${SRCFILE} || die
  	cd ${SRCDIR}
+ 	# upstream openssl-1.1 patch
+ 	mpatch ${PNAME}-10.1.28-openssl-1.1.patch || die
  	# apply our configuration
  #	mpatch ${PNAME}-5.5.19-cnf-defaults.patch || die
-Line 103 
 src_prepare()
+Line 109 
 src_prepare()
  src_compile()
  {
  	# off-tree build
- 	install -d ${SRCDIR}/build
+ 	cmake_setup_builddir || die
- 	cd ${SRCDIR}/build
  	# fixes some issues
  	export CFLAGS="${CFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -fomit-frame-pointer -fno-delete-null-pointer-checks"
-Line 114 
 src_compile()
+Line 119 
 src_compile()
  	export CFLAGS="${CFLAGS} -fPIC"
  	export CXXFLAGS="${CXXFLAGS} -fPIC"
- #	# fix issues with missing -latomic
+ #	# disable gold linker for i486
- #	export LDFLAGS+=" -latomic"
+ #	export LDFLAGS+=" -fuse-ld=bfd"
- 	# disable gold linker for i486
- 	export LDFLAGS+=" -fuse-ld=bfd"
  	cmake_configure \
  		-DWITH_COMMENT="Magellan MariaDB ${PVER}-${PBUILD}" \
-Line 151 
 src_compile()
+Line 153 
 src_compile()
  		$(cmake_without READLINE) \
  		$(cmake_with ZLIB system) \
  		$(cmake_with SSL system) \
- 		$(cmake_with PCRE system) \
+ 		$(cmake_with PCRE bundled) \
  		$(cmake_with JEMALLOC) \
  		$(cmake_without LIBWRAP) \
  		$(cmake_with EMBEDDED_SERVER) \
-Line 168 
 src_compile()
+Line 170 
 src_compile()
  		-DWITH_MYSQLD_LDFLAGS="-pie ${LDFLAGS},-z,now" \
  		|| die
- 	mmake || die
+ 	cmake_mmake || die
  }
  src_install_mariadb-libs()
  {
- 	cd ${SRCDIR}/build
+ 	cd ${SRCDIR}
  	# install only includes and clients libraries
  	local i
  	for i in include libmysql libmysqld libservices
  	do
- 		mmake -C ${i} DESTDIR=${BINDIR} install || die
+ 		cmake_mmake -C ${i} DESTDIR=${BINDIR} install || die
  	done
  	# symlink client libs to libdir
-Line 191 
 src_install_mariadb-libs()
+Line 193 
 src_install_mariadb-libs()
  	popd
  	# mysql-config
- 	minstallexec scripts/mysql_config || die
+ 	minstallexec ${BUILDDIR}/build/scripts/mysql_config || die
  	# man-pages
  	cd ${SRCDIR}
-Line 203 
 src_install_mariadb-libs()
+Line 205 
 src_install_mariadb-libs()
  src_install_mariadb-clients()
  {
- 	cd ${SRCDIR}/build
+ 	cd ${SRCDIR}
- 	mmake -C client DESTDIR=${BINDIR} install || die
+ 	cmake_mmake -C client DESTDIR=${BINDIR} install || die
  	# some common symlinks
  	for i in mysqlanalyze mysqlrepair mysqloptimize
-Line 228 
 src_install_mariadb-clients()
+Line 230 
 src_install_mariadb-clients()
  src_install_mariadb()
  {
- 	cd ${SRCDIR}/build
+ 	cd ${SRCDIR}
- 	mmake DESTDIR=${BINDIR} install || die
+ 	cmake_mmake DESTDIR=${BINDIR} install || die
  	# remove all unneeded stuff
  	local i
-Line 297 
 src_install_mariadb()
+Line 299 
 src_install_mariadb()
  	mkeepdir /var/log/mysql || die
  	mchown mysql:mysql /var/log/mysql || die
+ 	cd ${SRCDIR}
  	minstalldocs ChangeLog COPYING EXCEPTIONS-CLIENT README || die
  	minstalldocs support-files/my-*.cnf support-files/magic || die
  	minstalldocs support-files/ndb-config-2-node.ini || die
  	# install a default my.cnf
  	minstalldir /etc/mysql || die
- 	minstallfile support-files/my-medium.cnf /etc/mysql/my.cnf || die
+ 	minstallfile ${BUILDDIR}/build/support-files/my-medium.cnf /etc/mysql/my.cnf || die
  	# systemd specific
  	minstalltmp mysql.tmpfile-${TMP_REV} mysql.conf || die

 Legend:



Removed from v.11614
 


changed lines


 
Added in v.11615
 Legend:



Removed from v.11614
 


changed lines


 
Added in v.11615
-Removed from v.11614
+Added in v.11615