At http://bazaar.launchpad.net/~maria-captains/maria/5.2/ ------------------------------------------------------------ revno: 2794 revision-id: sergii@pisem.net-20100515084455-i2dajc6e0q73kny2 parent: sergii@pisem.net-20100514214532-xb23ovibzuenbd76 committer: Sergei Golubchik <sergii@pisem.net> branch nick: 5.2 timestamp: Sat 2010-05-15 10:44:55 +0200 message: oqgraph fix: not all gcc versions support -fvisibility-inlines-hidden === modified file 'storage/oqgraph/Makefile.am' --- a/storage/oqgraph/Makefile.am 2010-03-30 18:12:00 +0000 +++ b/storage/oqgraph/Makefile.am 2010-05-15 08:44:55 +0000 @@ -40,7 +40,9 @@ BOOST_CXXFLAGS = -frtti -fexceptions -fi # (automatically gets enabled anyway by -O* on some architectures) BOOST_CXXFLAGS+= -O3 -fstrict-aliasing BOOST_CXXFLAGS+= -falign-loops +if HAVE_FVISIBILITY_INLINES_HIDDEN BOOST_CXXFLAGS+= -fvisibility-inlines-hidden +endif BOOST_CXXFLAGS+= -funroll-loops -fno-trapping-math EXTRA_DIST = ha_oqgraph.h ha_oqgraph.cc graphcore.cc \ === modified file 'storage/oqgraph/plug.in' --- a/storage/oqgraph/plug.in 2010-03-30 07:33:38 +0000 +++ b/storage/oqgraph/plug.in 2010-05-15 08:44:55 +0000 @@ -2,9 +2,25 @@ MYSQL_STORAGE_ENGINE(oqgraph,,[Graph Sto [Open Query Graph Computation Engine], []) MYSQL_PLUGIN_DYNAMIC(oqgraph, [oqgraph_engine.la]) MYSQL_PLUGIN_DEPENDS_ON_MYSQL_INTERNALS(oqgraph, [ha_oqgraph.cc]) +MYSQL_PLUGIN_ACTIONS(oqgraph,[ + AC_LANG_PUSH([C++]) + AC_MSG_CHECKING([whether compiler supports -fvisibility-inlines-hidden]) + OLD_CXXFLAGS=$CXXFLAGS + CXXFLAGS="$CXXFLAGS -fvisibility-inlines-hidden" + AC_TRY_COMPILE([],[],[ + AM_CONDITIONAL(HAVE_FVISIBILITY_INLINES_HIDDEN, true) + AC_MSG_RESULT([yes]) + ], [ + AC_MSG_RESULT([no]) + ]) + CXXFLAGS=$OLD_CXXFLAGS + AC_LANG_POP() +]) + AM_CONDITIONAL([BUILD_OQGRAPH_FOR_MYSQL], true) AM_CONDITIONAL([BUILD_OQGRAPH_STANDALONE], false) AM_CONDITIONAL([HAVE_DTRACE], false) +AM_CONDITIONAL(HAVE_FVISIBILITY_INLINES_HIDDEN, false) AC_LANG_PUSH([C++])