diff options
| author | Joerg Bruehe <joerg.bruehe@oracle.com> | 2012-09-11 12:47:32 +0200 |
|---|---|---|
| committer | Joerg Bruehe <joerg.bruehe@oracle.com> | 2012-09-11 12:47:32 +0200 |
| commit | 2f15c56f7755d1e87099bafc13451f587328c6e6 (patch) | |
| tree | 1c5a339a72ee8b2bb2673ccb9bae26c406dc77cc | |
| parent | d02ceb6cf35302ebcb42498f61232654f1080c6b (diff) | |
| download | mariadb-git-mysql-5.1.66.tar.gz | |
Spec file change to work around cast ulonglong -> int.mysql-5.1.66
| -rw-r--r-- | support-files/mysql.spec.sh | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index ee0211fd3e0..395010b3773 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -374,7 +374,7 @@ CXXFLAGS=${CXXFLAGS:-$RPM_OPT_FLAGS -felide-constructors -fno-exceptions -fno-rt # Evaluate current setting of $DEBUG if [ $DEBUG -gt 0 ] ; then OPT_COMMENT='--with-comment="%{debug_comment}"' - OPT_DEBUG='--with-debug' + OPT_DEBUG='--with-debug --enable-mysql-maintainer-mode=no' CFLAGS=`echo " $CFLAGS " | \ sed -e 's/ -O[0-9]* / /' -e 's/ -unroll2 / /' -e 's/ -ip / /' \ -e 's/^ //' -e 's/ $//'` @@ -1191,6 +1191,11 @@ fi # merging BK trees) ############################################################################## %changelog +* Tue Sep 11 2012 Joerg Bruehe <joerg.bruehe@oracle.com> + +- Disable "maintainer mode" in debug builds, there is a cast ulonglong -> int + in the sources (since 2007) that would cause builds to fail. + * Wed Sep 14 2011 Joerg Bruehe <joerg.bruehe@oracle.com> - Let the RPM capabilities ("obsoletes" etc) ensure that an upgrade may replace |