[Lunar-commits] r26476 - moonbase/trunk/sql/mysql

[Dennis Veatch]

Author: stumbles
Date: 2007-10-29 06:48:43 +0100 (Mon, 29 Oct 2007)
New Revision: 26476

Modified:
   moonbase/trunk/sql/mysql/BUILD
Log:

Adding the x86_64 arch detection else mysql compiled with the embedded
answered yes will cause kdepim4 to tank with;

/usr/src/kdepim-3.94.0/akonadi/server/sqlplugin/qsql_mysql_embedded.cpp: In
 member function 'virtual bool QMYSQLEmbeddedDriver::has
/usr/src/kdepim-3.94.0/akonadi/server/sqlplugin/qsql_mysql_embedded.cpp:924:
 warning: enumeration value 'SimpleLocking' not handled
/usr/src/kdepim-3.94.0/akonadi/server/sqlplugin/qsql_mysql_embedded.cpp:924:
 warning: enumeration value 'LowPrecisionNumbers' not h
Linking CXX shared module ../../../lib/libqsqlmysqlembedded.so
/usr/bin/ld: /usr/lib/gcc/x86_64-pc-linux-gnu/4.1.2/../../../../lib64/
libmysqld.a(client.o): relocation R_X86_64_32S against `clien
/usr/lib/gcc/x86_64-pc-linux-gnu/4.1.2/../../../../lib64/libmysqld.a: could not
 read symbols: Bad value
collect2: ld returned 1 exit status
make[2]: *** [lib/libqsqlmysqlembedded.so] Error 1
make[1]: *** [akonadi/server/sqlplugin/CMakeFiles/qsql_mysql_embedded.dir/all] Error 2
make: *** [all] Error 2



Modified: moonbase/trunk/sql/mysql/BUILD
===================================================================
--- moonbase/trunk/sql/mysql/BUILD	2007-10-29 05:21:06 UTC (rev 26475)
+++ moonbase/trunk/sql/mysql/BUILD	2007-10-29 05:48:43 UTC (rev 26476)
@@ -8,6 +8,11 @@
         export CXXFLAGS="$CXXFLAGS -fPIC"
   fi &&
 
+  if [ "`arch`" == "x86_64" ]; then
+         export CFLAGS="$CFLAGS -fPIC"
+       export CXXFLAGS="$CXXFLAGS -fPIC"
+  fi &&
+
   export CXX='gcc' &&
 
   ./configure  --prefix=/usr                   \
@@ -43,7 +48,7 @@
   mkdir -p /var/lib/mysql                     &&
   make  pkglibdir=/usr/lib  install           &&
   rm    -rf  /usr/mysql-test                  &&
-  
+
   if  [ -x /etc/init.d/mysql.server ]; then
     rm -f /etc/init.d/mysql.server
     rm -f /etc/rc?.d/???mysql.server