Magellan Linux

  • Back to homepage
    • /[smage]/branches/magellan-next/extras/mysql5/mysql5-5.5.13-r1.smage2

    Diff of /branches/magellan-next/extras/mysql5/mysql5-5.5.13-r1.smage2

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

    revision 8015 by niro, Tue Jun 28 20:01:45 2011 UTC revision 8016 by niro, Tue Jun 28 21:35:49 2011 UTC
    # Line 41  src_prepare() Line 41  src_prepare()
    41    
    42  src_compile()  src_compile()
    43  {  {
    44   cd ${SRCDIR}   # build outside of the source dir
    45     install -d ${BUILDDIR}/build || die
    46     cd ${BUILDDIR}/build
    47    
    48   # fixes some issues   # fixes some issues
    49   export CFLAGS="${CFLAGS} -fno-exceptions -fno-strict-aliasing -DBIG_JOINS=1 -fomit-frame-pointer"   export CFLAGS="${CFLAGS} -fno-exceptions -fno-strict-aliasing -DBIG_JOINS=1 -fomit-frame-pointer"
    # Line 52  src_compile() Line 54  src_compile()
    54   export CXXFLAGS="${CXXFLAGS} -fPIC"   export CXXFLAGS="${CXXFLAGS} -fPIC"
    55    
    56   cmake_configure \   cmake_configure \
    57   $(cmake_install INFODIR share/mysql/docs) \   -DWITH_COMMENT="Magellan MySQL ${PVER}-${PBUILD}" \
    58   $(cmake_install MANDIR share/man) \   $(cmake_install BINDIR bin) \
    59   $(cmake_install PLUGINDIR /usr/$(mlibdir)/mysql/plugin) \   $(cmake_install SBINDIR sbin) \
    60   $(cmake_install SCRIPTDIR bin) \   $(cmake_install DOCDIR share/doc/mysql) \
    61     $(cmake_install DOCREADMEDIR share/doc/mysql) \
    62   $(cmake_install INCLUDEDIR include/mysql) \   $(cmake_install INCLUDEDIR include/mysql) \
    63   $(cmake_install DOCREADMEDIR share/mysql) \   $(cmake_install INFODIR share/info) \
    64   $(cmake_install SUPPORTFILESDIR share/mysql) \   $(cmake_install LIBDIR $(mlibdir)/mysql) \
    65     $(cmake_install MANDIR share/man) \
    66     $(cmake_install MYSQLDATADIR /var/lib/mysql) \
    67   $(cmake_install MYSQLSHAREDIR share/mysql) \   $(cmake_install MYSQLSHAREDIR share/mysql) \
    68   $(cmake_install DOCDIR share/mysql/docs) \   $(cmake_install MYSQLTESTDIR share/mysql/mysql-test) \
    69   $(cmake_install SHAREDIR share/mysql) \   $(cmake_install PLUGINDIR $(mlibdir)/mysql/plugin) \
    70   \   $(cmake_install SCRIPTDIR share/mysql/scripts) \
    71   $(cmake_opt MANUFACTURER Magellan-Linux) \   $(cmake_install SQLBENCHDIR share/mysql) \
    72     $(cmake_install SUPPORTFILESDIR /usr/share/mysql) \
    73   $(cmake_opt SYSCONFDIR /etc/mysql) \   $(cmake_opt SYSCONFDIR /etc/mysql) \
    74   $(cmake_opt MYSQL_DATADIR /var/lib/mysql) \   $(cmake_opt MYSQL_USER mysql) \
    75   $(cmake_opt MYSQL_UNIX_ADDR /var/run/mysqld/mysqld.sock) \   $(cmake_opt MYSQL_UNIX_ADDR /var/run/mysqld/mysqld.sock) \
      $(cmake_opt DEFAULT_CHARSET utf8) \  
      $(cmake_opt DEFAULT_COLLATION utf8_general_ci) \  
      \ # no mistake here, has nothing to do with cmake_enable!  
    76   $(cmake_opt ENABLED_LOCAL_INFILE ON) \   $(cmake_opt ENABLED_LOCAL_INFILE ON) \
    77   \   $(cmake_opt EXTRA_CHARSETS all) \
    78   $(cmake_with READLINE) \   $(cmake_without READLINE) \
    79   $(cmake_with ZLIB system) \   $(cmake_with ZLIB system) \
    80   $(cmake_with SSL system) \   $(cmake_with SSL system) \
    81   $(cmake_with LIBWRAP) \   $(cmake_with LIBWRAP) \
    82   $(cmake_with EXTRA_CHARSETS complex) \   $(cmake_with EXTRA_CHARSETS complex) \
    83   $(cmake_with EMBEDDED_SERVER) \   $(cmake_with EMBEDDED_SERVER) \
    84   $(cmake_with INNOBASE_STORAGE_ENGINE 1) \   $(cmake_with INNOBASE_STORAGE_ENGINE) \
    85   $(cmake_with PARTITION_STORAGE_ENGINE 1) \   $(cmake_with PARTITION_STORAGE_ENGINE) \
    86   $(cmake_without EXAMPLE_STORAGE_ENGINE 1) \   $(cmake_without EXAMPLE_STORAGE_ENGINE) \
    87   $(cmake_without ARCHIVE_STORAGE_ENGINE 1) \   $(cmake_without ARCHIVE_STORAGE_ENGINE) \
    88   $(cmake_without BLACKHOLE_STORAGE_ENGINE 1) \   $(cmake_without BLACKHOLE_STORAGE_ENGINE) \
    89   $(cmake_without FEDERATED_STORAGE_ENGINE 1) \   $(cmake_without FEDERATED_STORAGE_ENGINE) \
    90     $(cmake_without UNIT_TESTS) \
    91   || die   || die
    92    
    93   mmake || die   mmake || die
    # Line 91  src_compile() Line 95  src_compile()
    95    
    96  src_install()  src_install()
    97  {  {
    98   cd ${SRCDIR}   cd ${BUILDDIR}/build
    99   mmake DESTDIR=${BINDIR} install || die   mmake DESTDIR=${BINDIR} install || die
    100    
    101   # symlink client libs to libdir   # symlink client libs to libdir
    Legend:
    Removed from v.8015  
    changed lines
      Added in v.8016