- added sql-cxx-pic patch (-fPIC as workaround for -rdynamic and C++ vtables on gcc3...

- -fomit-frame-pointer only if no debug

Changed files:
    mysql.spec -> 1.169

diff --git a/mysql.spec b/mysql.spec
index 2209c0c32795836541fc0dc6086e0e7be1d5decc..a226ee32c2cb2e1c24bfadeef402d8c97f7ef0f3 100644 (file)
--- a/mysql.spec
+++ b/mysql.spec
@@ -30,6 +30,7 @@ Patch3:               %{name}-_r-link.patch
 Patch4:                %{name}-info.patch
 Patch5:                %{name}-dump_quote_db_names.patch
 Patch6:                %{name}-manfixes.patch
+Patch7:                %{name}-sql-cxx-pic.patch
 Icon:          mysql.gif
 URL:           http://www.mysql.com/
 #BuildRequires:        ORBit-devel
@@ -320,6 +321,12 @@ MySQL.
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%ifarch alpha
+# this is strange: mysqld functions for UDF modules are not explicitly defined,
+# so -rdynamic is used; in such case gcc3+ld on alpha doesn't like C++ vtables
+# in objects compiled without -fPIC
+%patch7 -p1
+%endif
 
 %build
 rm -f missing
@@ -327,8 +334,8 @@ rm -f missing
 %{__aclocal}
 %{__automake}
 %{__autoconf}
-CXXFLAGS="%{rpmcflags} -fno-rtti -fno-exceptions -fomit-frame-pointer"
-CFLAGS="%{rpmcflags} -fomit-frame-pointer"
+CXXFLAGS="%{rpmcflags} -fno-rtti -fno-exceptions %{!?debug:-fomit-frame-pointer}"
+CFLAGS="%{rpmcflags} %{!?debug:-fomit-frame-pointer}"
 %configure \
        -C \
        --with-pthread \