Magellan Linux

  • Back to homepage
    • /[alx-svn]/smage/trunk/core/mariadb/mariadb-10.4.13-r1.smage2

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

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

    revision 14318 by niro, Wed Jul 8 11:28:15 2020 UTC revision 14319 by niro, Wed Jul 8 15:17:21 2020 UTC
    # Line 111  src_compile() Line 111  src_compile()
    111    
    112   cmake_configure \   cmake_configure \
    113   -DWITH_COMMENT="Magellan MariaDB ${PVER}-${PBUILD}" \   -DWITH_COMMENT="Magellan MariaDB ${PVER}-${PBUILD}" \
    114     -DCMAKE_BUILD_TYPE=RelWithDebInfo \
    115   -DCMAKE_AR=/usr/bin/gcc-ar \   -DCMAKE_AR=/usr/bin/gcc-ar \
    116   -DCMAKE_RANLIB=/usr/bin/gcc-ranlib \   -DCMAKE_RANLIB=/usr/bin/gcc-ranlib \
    117     -Wno-dev \
    118   $(cmake_install BINDIR bin) \   $(cmake_install BINDIR bin) \
    119   $(cmake_install SBINDIR sbin) \   $(cmake_install SBINDIR sbin) \
    120   $(cmake_install DOCDIR share/doc/mysql) \   $(cmake_install DOCDIR share/doc/mysql) \
    # Line 128  src_compile() Line 130  src_compile()
    130   $(cmake_install SCRIPTDIR bin) \   $(cmake_install SCRIPTDIR bin) \
    131   $(cmake_install SQLBENCHDIR share/mysql) \   $(cmake_install SQLBENCHDIR share/mysql) \
    132   $(cmake_install SUPPORTFILESDIR /usr/share/mysql) \   $(cmake_install SUPPORTFILESDIR /usr/share/mysql) \
    133   $(cmake_opt SYSCONFDIR /etc/mysql) \   $(cmake_install SYSCONFDIR /etc/mysql) \
    134     $(cmake_install SYSCONF2DIR /etc/mysql/my.cnf.d) \
    135   $(cmake_opt MYSQL_USER mysql) \   $(cmake_opt MYSQL_USER mysql) \
    136   $(cmake_opt MYSQL_UNIX_ADDR /run/mysqld/mysqld.sock) \   $(cmake_opt MYSQL_UNIX_ADDR /run/mysqld/mysqld.sock) \
    137   $(cmake_opt ENABLED_LOCAL_INFILE ON) \   $(cmake_opt ENABLED_LOCAL_INFILE ON) \
    # Line 168  src_install_mariadb-libs() Line 171  src_install_mariadb-libs()
    171    
    172   # install only includes and clients libraries   # install only includes and clients libraries
    173   local i   local i
    174   for i in include libmysql libmysqld libservices   for i in include libmariadb libmysqld libservices
    175   do   do
    176   cmake_mmake -C ${i} DESTDIR=${BINDIR} install || die   cmake_mmake -C ${i} DESTDIR=${BINDIR} install || die
    177   done   done
    # Line 293  src_install_mariadb() Line 296  src_install_mariadb()
    296   minstalldocs support-files/my-*.cnf support-files/magic || die   minstalldocs support-files/my-*.cnf support-files/magic || die
    297   minstalldocs support-files/ndb-config-2-node.ini || die   minstalldocs support-files/ndb-config-2-node.ini || die
    298    
    299   # install a default my.cnf and wsrep.cnf  # provided by mariadb
    300   minstalldir /etc/mysql || die  # # install a default my.cnf and wsrep.cnf
    301   minstallfile ${BUILDDIR}/build/support-files/my-medium.cnf /etc/mysql/my.cnf || die  # minstalldir /etc/mysql || die
    302   minstallfile ${BUILDDIR}/build/support-files/wsrep.cnf /etc/mysql/wsrep.cnf || die  # #minstallfile ${BUILDDIR}/build/support-files/my-medium.cnf /etc/mysql/my.cnf || die
    303    # minstallfile ${BUILDDIR}/build/support-files/wsrep.cnf /etc/mysql/wsrep.cnf || die
    304    
    305     # fix pathes in provided my.cnf
    306     sed -i 's:includedir /etc/my.cnf.d:includedir /etc/mysql/my.cnf.d:g' ${BINDIR}/etc/mysql/my.cnf || die
    307    
    308   # rename them to proper names   # rename them to proper names
    309   mmove ${BINDIR}/$(mget-systemd-sysusersdir)/sysusers.conf $(mget-systemd-sysusersdir)/mariadb.conf || die   mmove ${BINDIR}/$(mget-systemd-sysusersdir)/sysusers.conf $(mget-systemd-sysusersdir)/mariadb.conf || die
    Legend:
    Removed from v.14318  
    changed lines
      Added in v.14319