List:Commits« Previous MessageNext Message »
From:Jonathan Perkin Date:January 27 2009 11:16am
Subject:bzr push into mysql-6.0 branch (jperkin:2796 to 2797)
View as plain text  
 2797 Jonathan Perkin	2009-01-27
      Fix a bunch of AIX/HPUX builds.  Remove -g from individial C*FLAGS, it's
      specified as a default option.
modified:
  BUILD/preconfigure

 2796 Jonathan Perkin	2009-01-22
      Disable libevent on HPUX 11.11
modified:
  BUILD/preconfigure

=== modified file 'BUILD/preconfigure'

=== modified file 'BUILD/preconfigure'
--- a/BUILD/preconfigure	2009-01-22 20:00:05 +0000
+++ b/BUILD/preconfigure	2009-01-27 11:14:28 +0000
@@ -252,8 +252,8 @@
         'env' => {
             'CC' => 'cc',
             'CXX' => 'CC',
-            'CFLAGS' => '-g -fast -xtarget=ultra3 -Xa -xstrconst -mt -D_FORTEC_ -m32',
-            'CXXFLAGS' => '-g -fast -xtarget=ultra3 -noex -mt -D_FORTEC_ -m32',
+            'CFLAGS' => '-fast -xtarget=ultra3 -Xa -xstrconst -mt -D_FORTEC_ -m32',
+            'CXXFLAGS' => '-fast -xtarget=ultra3 -noex -mt -D_FORTEC_ -m32',
             'LDFLAGS' => '-m32',
             'ASFLAGS' => '-m32',
         },
@@ -272,8 +272,8 @@
             'CXX' => 'CC',
             # XXX: Studio 12 gives internal compiler error when using -xO3 for Falcon,
             # drop back to -xO2 for now.
-            'CFLAGS' => '-g -xO2 -xtarget=ultra3 -Xa -xstrconst -mt -D_FORTEC_ -m64',
-            'CXXFLAGS' => '-g -xO2 -xtarget=ultra3 -noex -mt -D_FORTEC_ -m64',
+            'CFLAGS' => '-xO2 -xtarget=ultra3 -Xa -xstrconst -mt -D_FORTEC_ -m64',
+            'CXXFLAGS' => '-xO2 -xtarget=ultra3 -noex -mt -D_FORTEC_ -m64',
             'LDFLAGS' => '-m64',
             'ASFLAGS' => '-m64',
         },
@@ -290,8 +290,8 @@
         'env' => {
             'CC' => 'cc',
             'CXX' => 'CC',
-            'CFLAGS' => '-g -m64 -xO3 -mt -fsimple=1 -ftrap=%none -nofstore -xbuiltin=%all -xlibmil -xlibmopt -xtarget=generic',
-            'CXXFLAGS' => '-g -m64 -xO3 -mt -fsimple=1 -ftrap=%none -nofstore -xbuiltin=%all -features=no%except -xlibmil -xlibmopt -xtarget=generic',
+            'CFLAGS' => '-m64 -xO3 -mt -fsimple=1 -ftrap=%none -nofstore -xbuiltin=%all -xlibmil -xlibmopt -xtarget=generic',
+            'CXXFLAGS' => '-m64 -xO3 -mt -fsimple=1 -ftrap=%none -nofstore -xbuiltin=%all -features=no%except -xlibmil -xlibmopt -xtarget=generic',
             'LDFLAGS' => '-m64',
             'LIBRARY_PATH' => '/usr/lib/amd64',
         },
@@ -311,8 +311,8 @@
             'CXX' => 'CC',
             # XXX: Studio 12 gives internal compiler error when using -xO3 for Falcon,
             # drop back to -xO2 for now.
-            'CFLAGS' => '-g -xO2 -mt -fsimple=1 -ftrap=%none -nofstore -xbuiltin=%all -xlibmil -xlibmopt -xtarget=generic',
-            'CXXFLAGS' => '-g -xO2 -mt -fsimple=1 -ftrap=%none -nofstore -xbuiltin=%all -features=no%except -xlibmil -xlibmopt -xtarget=generic',
+            'CFLAGS' => '-xO2 -mt -fsimple=1 -ftrap=%none -nofstore -xbuiltin=%all -xlibmil -xlibmopt -xtarget=generic',
+            'CXXFLAGS' => '-xO2 -mt -fsimple=1 -ftrap=%none -nofstore -xbuiltin=%all -features=no%except -xlibmil -xlibmopt -xtarget=generic',
         },
         'opt' => {
             '--with-mysqld-libs' => '-lmtmalloc',
@@ -325,11 +325,11 @@
 #
     'solaris10-sparc-64bit-gcc' => {
         'env' => {
-            'CFLAGS' => '-g -O3 -m64',
+            'CFLAGS' => '-O3 -m64',
             'CC' => 'gcc -static-libgcc',
             'AS' => '/opt/gnu/bin/as',
             'LD' => '/opt/gnu/bin/ld',
-            'CXXFLAGS' => '-g -O3 -felide-constructors -fno-exceptions -fno-rtti -m64',
+            'CXXFLAGS' => '-O3 -felide-constructors -fno-exceptions -fno-rtti -m64',
             'CXX' => 'g++ -static-libgcc',
             'CXXLD' => 'g++ -static-libgcc',
         },
@@ -343,10 +343,10 @@
 #
     'solaris9-sparc-32bit' => {
         'env' => {
-            'CFLAGS' => '-g -xO3 -Xa -xstrconst -mt -D_FORTEC_ -xarch=v8plusa',
+            'CFLAGS' => '-xO3 -Xa -xstrconst -mt -D_FORTEC_ -xarch=v8plusa',
             'CC' => 'cc',
             'LDFLAGS' => '-xarch=v8plusa',
-            'CXXFLAGS' => '-g -xO3 -noex -mt -D_FORTEC_ -xarch=v8plusa',
+            'CXXFLAGS' => '-xO3 -noex -mt -D_FORTEC_ -xarch=v8plusa',
             'CXX' => 'CC',
             'ASFLAGS' => '-xarch=v8plusa',
         },
@@ -361,10 +361,10 @@
 #
     'solaris9-sparc-64bit' => {
         'env' => {
-            'CFLAGS' => '-g -xO3 -Xa -xstrconst -mt -D_FORTEC_ -xarch=v9',
+            'CFLAGS' => '-xO3 -Xa -xstrconst -mt -D_FORTEC_ -xarch=v9',
             'CC' => 'cc',
             'LDFLAGS' => '-xarch=v9',
-            'CXXFLAGS' => '-g -xO3 -noex -mt -D_FORTEC_ -xarch=v9',
+            'CXXFLAGS' => '-xO3 -noex -mt -D_FORTEC_ -xarch=v9',
             'CXX' => 'CC',
             'ASFLAGS' => '-xarch=v9',
         },
@@ -378,9 +378,9 @@
 #
     'solaris9-x86' => {
         'env' => {
-            'CFLAGS' => '-g -xO3 -mt -fsimple=1 -ftrap=%none -nofstore -xbuiltin=%all -xlibmil -xlibmopt -xtarget=generic',
+            'CFLAGS' => '-xO3 -mt -fsimple=1 -ftrap=%none -nofstore -xbuiltin=%all -xlibmil -xlibmopt -xtarget=generic',
             'CC' => 'cc',
-            'CXXFLAGS' => '-g -xO3 -mt -fsimple=1 -ftrap=%none -nofstore -xbuiltin=%all -features=no%except -xlibmil -xlibmopt -xtarget=generic',
+            'CXXFLAGS' => '-xO3 -mt -fsimple=1 -ftrap=%none -nofstore -xbuiltin=%all -features=no%except -xlibmil -xlibmopt -xtarget=generic',
             'CXX' => 'CC',
         },
         'opt' => {
@@ -393,9 +393,9 @@
 #
     'solaris8-x86' => {
         'env' => {
-            'CFLAGS' => '-g -xO3 -mt -fsimple=1 -ftrap=%none -nofstore -xbuiltin=%all -xlibmil -xlibmopt -xtarget=generic',
+            'CFLAGS' => '-xO3 -mt -fsimple=1 -ftrap=%none -nofstore -xbuiltin=%all -xlibmil -xlibmopt -xtarget=generic',
             'CC' => 'cc',
-            'CXXFLAGS' => '-g -xO3 -mt -fsimple=1 -ftrap=%none -nofstore -xbuiltin=%all -features=no%except -xlibmil -xlibmopt -xtarget=generic',
+            'CXXFLAGS' => '-xO3 -mt -fsimple=1 -ftrap=%none -nofstore -xbuiltin=%all -features=no%except -xlibmil -xlibmopt -xtarget=generic',
             'CXX' => 'CC',
         },
         'opt' => {
@@ -407,9 +407,9 @@
 #
     'solaris8-sparc-32bit-gcc' => {
         'env' => {
-            'CFLAGS' => '-g -xO3 -DHAVE_MYSYS_NEW',
+            'CFLAGS' => '-xO3 -DHAVE_MYSYS_NEW',
             'CC' => 'gcc',
-            'CXXFLAGS' => '-g -xO3 -DHAVE_MYSYS_NEW',
+            'CXXFLAGS' => '-xO3 -DHAVE_MYSYS_NEW',
             'CXX' => 'g++',
         },
         'opt' => {
@@ -424,10 +424,10 @@
 #
     'solaris8-sparc-64bit-gcc' => {
         'env' => {
-            'CFLAGS' => '-g -O -m64',
+            'CFLAGS' => '-O -m64',
             'CC' => 'gcc -static-libgcc',
             'LDFLAGS' => '-m64',
-            'CXXFLAGS' => '-g -O3 -DHAVE_MYSYS_NEW -m64',
+            'CXXFLAGS' => '-O3 -DHAVE_MYSYS_NEW -m64',
             'CXX' => 'g++ -static-libgcc',
         },
         'opt' => {
@@ -441,11 +441,11 @@
 #
     'i5os-power-64bit' => {
         'env' => {
-            'CFLAGS' => '-g -q64 -ma -O2 -qstrict -qoptimize=2 -qmaxmem=8192',
+            'CFLAGS' => '-q64 -ma -O2 -qstrict -qoptimize=2 -qmaxmem=8192',
             'NM' => 'nm -X64',
             'CC' => 'xlc_r',
             'LDFLAGS' => '-Wl,-brtl',
-            'CXXFLAGS' => '-g -q64 -ma -O2 -qstrict -qoptimize=2 -qmaxmem=8192',
+            'CXXFLAGS' => '-q64 -ma -O2 -qstrict -qoptimize=2 -qmaxmem=8192',
             'CXX' => 'xlC_r',
             'AR' => 'ar -X64',
         },
@@ -465,10 +465,10 @@
 #
     'i5os-power-32bit' => {
         'env' => {
-            'CFLAGS' => '-g -ma -qstrict -qoptimize=0 -qmaxmem=8192',
+            'CFLAGS' => '-ma -qstrict -qoptimize=0 -qmaxmem=8192',
             'CC' => 'xlc_r',
             'LDFLAGS' => '-Wl,-brtl',
-            'CXXFLAGS' => '-g -ma -qstrict -qoptimize=0 -qmaxmem=8192',
+            'CXXFLAGS' => '-ma -qstrict -qoptimize=0 -qmaxmem=8192',
             'CXX' => 'xlC_r',
         },
         'opt' => {
@@ -487,16 +487,19 @@
 #
     'aix5.2-powerpc-32bit' => {
         'env' => {
-            'CFLAGS' => '-g -ma -qstrict -qoptimize=0 -qmaxmem=8192',
+            'CFLAGS' => '-ma -qstrict -qoptimize=0 -qmaxmem=8192',
             'CC' => 'xlc_r',
             'LDFLAGS' => '-Wl,-brtl',
-            'CXXFLAGS' => '-g -ma -qstrict -qoptimize=0 -qmaxmem=8192',
+            'CXXFLAGS' => '-ma -qstrict -qoptimize=0 -qmaxmem=8192',
             'CXX' => 'xlC_r',
         },
         'opt' => {
+            '--with-mysqld-ldflags' => '-static -Wl,-bexpfull',
+            '--without-falcon' => undef,
             '--with-named-z-libs' => 'no',
+            '!--with-embedded-server' => undef,
+            '!--with-libevent' => undef,
             '!--with-ssl' => undef,
-            '--without-falcon' => undef,
         },
     },
 
@@ -505,17 +508,20 @@
 #
     'aix5.2-powerpc-64bit' => {
         'env' => {
-            'CFLAGS' => '-g -q64 -ma -O2 -qstrict -qoptimize=2 -qmaxmem=8192',
+            'CFLAGS' => '-q64 -ma -O2 -qstrict -qoptimize=2 -qmaxmem=8192',
             'CC' => 'xlc_r',
             'LDFLAGS' => '-Wl,-brtl',
-            'CXXFLAGS' => '-g -q64 -ma -O2 -qstrict -qoptimize=2 -qmaxmem=8192',
+            'CXXFLAGS' => '-q64 -ma -O2 -qstrict -qoptimize=2 -qmaxmem=8192',
             'CXX' => 'xlC_r',
             'AR' => 'ar -Xany',
         },
         'opt' => {
+            '--with-mysqld-ldflags' => '-static -Wl,-bexpfull',
+            '--without-falcon' => undef,
             '--with-named-z-libs' => 'no',
+            '!--with-embedded-server' => undef,
+            '!--with-libevent' => undef,
             '!--with-ssl' => undef,
-            '--without-falcon' => undef,
         },
     },
 
@@ -524,16 +530,19 @@
 #
     'aix5.3-powerpc-32bit' => {
         'env' => {
-            'CFLAGS' => '-g -ma -qstrict -qoptimize=0 -qmaxmem=8192',
+            'CFLAGS' => '-ma -qstrict -qoptimize=0 -qmaxmem=8192',
             'CC' => 'xlc_r',
             'LDFLAGS' => '-Wl,-brtl',
-            'CXXFLAGS' => '-g -ma -qstrict -qoptimize=0 -qmaxmem=8192',
+            'CXXFLAGS' => '-ma -qstrict -qoptimize=0 -qmaxmem=8192',
             'CXX' => 'xlC_r',
         },
         'opt' => {
+            '--with-mysqld-ldflags' => '-static -Wl,-bexpfull',
+            '--without-falcon' => undef,
             '--with-named-z-libs' => 'no',
+            '!--with-embedded-server' => undef,
+            '!--with-libevent' => undef,
             '!--with-ssl' => undef,
-            '--without-falcon' => undef,
         },
     },
 
@@ -542,17 +551,20 @@
 #
     'aix5.3-powerpc-64bit' => {
         'env' => {
-            'CFLAGS' => '-g -q64 -ma -O2 -qstrict -qoptimize=2 -qmaxmem=8192',
+            'CFLAGS' => '-q64 -ma -O2 -qstrict -qoptimize=2 -qmaxmem=8192',
             'CC' => 'xlc_r',
             'LDFLAGS' => '-Wl,-brtl',
-            'CXXFLAGS' => '-g -q64 -ma -O2 -qstrict -qoptimize=2 -qmaxmem=8192',
+            'CXXFLAGS' => '-q64 -ma -O2 -qstrict -qoptimize=2 -qmaxmem=8192',
             'CXX' => 'xlC_r',
             'AR' => 'ar -Xany',
         },
         'opt' => {
+            '--with-mysqld-ldflags' => '-static -Wl,-bexpfull',
+            '--without-falcon' => undef,
             '--with-named-z-libs' => 'no',
+            '!--with-embedded-server' => undef,
+            '!--with-libevent' => undef,
             '!--with-ssl' => undef,
-            '--without-falcon' => undef,
         },
     },
 
@@ -561,9 +573,9 @@
 #
     'freebsd6.0-x86' => {
         'env' => {
-            'CFLAGS' => '-g -O3',
+            'CFLAGS' => '-O3',
             'CC' => 'gcc -static-libgcc',
-            'CXXFLAGS' => '-g -O3',
+            'CXXFLAGS' => '-O3',
             'CXX' => 'g++ -static-libgcc',
         },
         'opt' => {
@@ -576,9 +588,9 @@
 #
     'freebsd6.0-x86_64' => {
         'env' => {
-            'CFLAGS' => '-g -O3',
+            'CFLAGS' => '-O3',
             'CC' => 'gcc -static-libgcc',
-            'CXXFLAGS' => '-g -O3',
+            'CXXFLAGS' => '-O3',
             'CXX' => 'g++ -static-libgcc',
         },
         'opt' => {
@@ -592,9 +604,9 @@
 #
     'linux-x86_64' => {
         'env' => {
-            'CFLAGS' => '-g -O3',
+            'CFLAGS' => '-O3',
             'CC' => 'gcc -static-libgcc',
-            'CXXFLAGS' => '-g -O3',
+            'CXXFLAGS' => '-O3',
             'CXX' => 'g++ -static-libgcc',
         },
         'opt' => {
@@ -607,9 +619,9 @@
 #
     'linux-powerpc' => {
         'env' => {
-            'CFLAGS' => '-g -O3 -mpowerpc -mcpu=powerpc',
+            'CFLAGS' => '-O3 -mpowerpc -mcpu=powerpc',
             'CC' => 'gcc -static-libgcc',
-            'CXXFLAGS' => '-g -O3 -mpowerpc -mcpu=powerpc',
+            'CXXFLAGS' => '-O3 -mpowerpc -mcpu=powerpc',
             'CXX' => 'g++ -static-libgcc',
         },
         'opt' => {
@@ -623,9 +635,9 @@
 #
     'linux-x86_64-icc' => {
         'env' => {
-            'CFLAGS' => '-g -O3 -mp -restrict',
-            'CC' => 'icc  -static-intel -static-libgcc',
-            'CXXFLAGS' => '-g -O3 -mp -restrict',
+            'CFLAGS' => '-O3 -mp -restrict',
+            'CC' => 'icc -static-intel -static-libgcc',
+            'CXXFLAGS' => '-O3 -mp -restrict',
             'CXX' => 'icpc -static-intel -static-libgcc',
         },
         'opt' => {
@@ -639,9 +651,9 @@
 #
     'linux-ia64-icc' => {
         'env' => {
-            'CFLAGS' => '-g -O3 -mp -restrict -no-ftz',
-            'CC' => 'icc  -static-intel -static-libgcc',
-            'CXXFLAGS' => '-g -O3 -mp -restrict -no-ftz',
+            'CFLAGS' => '-O3 -mp -restrict -no-ftz',
+            'CC' => 'icc -static-intel -static-libgcc',
+            'CXXFLAGS' => '-O3 -mp -restrict -no-ftz',
             'CXX' => 'icpc -static-intel -static-libgcc',
         },
         'opt' => {
@@ -655,9 +667,9 @@
 #
     'linux-x86' => {
         'env' => {
-            'CFLAGS' => '-g -O3',
+            'CFLAGS' => '-O3',
             'CC' => 'gcc -static-libgcc',
-            'CXXFLAGS' => '-g -O3',
+            'CXXFLAGS' => '-O3',
             'CXX' => 'g++ -static-libgcc',
         },
         'opt' => {
@@ -671,9 +683,9 @@
 #
     'linux-x86-valgrind' => {
         'env' => {
-            'CFLAGS' => '-O3 -g -fno-omit-frame-pointers -USAFEMALLOC -UFORCE_INIT_OF_VARS -DHAVE_purify',
+            'CFLAGS' => '-O3 -fno-omit-frame-pointers -USAFEMALLOC -UFORCE_INIT_OF_VARS -DHAVE_purify',
             'CC' => 'gcc -static-libgcc',
-            'CXXFLAGS' => '-O3 -g -fno-omit-frame-pointers -USAFEMALLOC -UFORCE_INIT_OF_VARS -DHAVE_purify',
+            'CXXFLAGS' => '-O3 -fno-omit-frame-pointers -USAFEMALLOC -UFORCE_INIT_OF_VARS -DHAVE_purify',
             'CXX' => 'g++ -static-libgcc',
         },
         'opt' => {
@@ -686,9 +698,9 @@
 #
     'linux-x86-icc' => {
         'env' => {
-            'CFLAGS' => '-g -O3 -mp -restrict',
-            'CC' => 'icc  -static-intel -static-libgcc',
-            'CXXFLAGS' => '-g -O3 -mp -restrict',
+            'CFLAGS' => '-O3 -mp -restrict',
+            'CC' => 'icc -static-intel -static-libgcc',
+            'CXXFLAGS' => '-O3 -mp -restrict',
             'CXX' => 'icpc -static-intel -static-libgcc',
         },
         'opt' => {
@@ -703,9 +715,9 @@
 #
     'linux-s390x' => {
         'env' => {
-            'CFLAGS' => '-g -O2',
+            'CFLAGS' => '-O2',
             'CC' => 'gcc -static-libgcc',
-            'CXXFLAGS' => '-g -O2 -felide-constructors',
+            'CXXFLAGS' => '-O2 -felide-constructors',
             'CXX' => 'g++ -static-libgcc',
         },
         'opt' => {
@@ -731,9 +743,9 @@
 #
     'osx10.5-x86_64' => {
         'env' => {
-            'CFLAGS' => '-g -Os -arch^x86_64 -fno-common',
+            'CFLAGS' => '-Os -arch^x86_64 -fno-common',
             'CC' => 'gcc -static-libgcc',
-            'CXXFLAGS' => '-g -Os -arch^x86_64 -felide-constructors -fno-common',
+            'CXXFLAGS' => '-Os -arch^x86_64 -felide-constructors -fno-common',
             'CXX' => 'g++ -static-libgcc',
         },
         'opt' => {
@@ -745,10 +757,10 @@
 #
     'osx10.5-powerpc-32bit' => {
         'env' => {
-            'CFLAGS' => '-g -Os -arch^ppc -fno-common',
+            'CFLAGS' => '-Os -arch^ppc -fno-common',
             'CC' => 'gcc -static-libgcc',
             'LDFLAGS' => '-arch^ppc',
-            'CXXFLAGS' => '-g -Os -arch^ppc -felide-constructors -fno-common',
+            'CXXFLAGS' => '-Os -arch^ppc -felide-constructors -fno-common',
             'CXX' => 'g++ -static-libgcc',
         },
         'opt' => {
@@ -761,10 +773,10 @@
 #
     'osx10.5-powerpc-64bit' => {
         'env' => {
-            'CFLAGS' => '-g -Os -arch^ppc64 -fno-common',
+            'CFLAGS' => '-Os -arch^ppc64 -fno-common',
             'CC' => 'gcc -static-libgcc',
             'LDFLAGS' => '-arch^ppc64',
-            'CXXFLAGS' => '-g -Os -arch^ppc64 -felide-constructors -fno-common',
+            'CXXFLAGS' => '-Os -arch^ppc64 -felide-constructors -fno-common',
             'CXX' => 'g++ -static-libgcc',
         },
         'opt' => {
@@ -777,9 +789,9 @@
 #
     'osx10.5-x86' => {
         'env' => {
-            'CFLAGS' => '-g -Os -arch^i386 -fno-common',
+            'CFLAGS' => '-Os -arch^i386 -fno-common',
             'CC' => 'gcc -static-libgcc',
-            'CXXFLAGS' => '-g -Os -arch^i386 -felide-constructors -fno-common',
+            'CXXFLAGS' => '-Os -arch^i386 -felide-constructors -fno-common',
             'CXX' => 'g++ -static-libgcc',
         },
         'opt' => {
@@ -791,10 +803,10 @@
 #
     'osx10.4-powerpc-64bit' => {
         'env' => {
-            'CFLAGS' => '-g -Os -arch^ppc64 -fno-common',
+            'CFLAGS' => '-Os -arch^ppc64 -fno-common',
             'CC' => 'gcc -static-libgcc',
             'LDFLAGS' => '-arch^ppc64',
-            'CXXFLAGS' => '-g -Os -arch^ppc64 -felide-constructors -fno-common',
+            'CXXFLAGS' => '-Os -arch^ppc64 -felide-constructors -fno-common',
             'CXX' => 'g++ -static-libgcc',
         },
         'opt' => {
@@ -807,9 +819,9 @@
 #
     'osx10.4-x86' => {
         'env' => {
-            'CFLAGS' => '-g -Os -arch^i386 -fno-common',
+            'CFLAGS' => '-Os -arch^i386 -fno-common',
             'CC' => 'gcc -static-libgcc',
-            'CXXFLAGS' => '-g -Os -arch^i386 -felide-constructors -fno-common',
+            'CXXFLAGS' => '-Os -arch^i386 -felide-constructors -fno-common',
             'CXX' => 'g++ -static-libgcc',
         },
         'opt' => {
@@ -821,9 +833,9 @@
 #
     'osx10.4-powerpc-32bit' => {
         'env' => {
-            'CFLAGS' => '-g -Os -arch^ppc -fno-common',
+            'CFLAGS' => '-Os -arch^ppc -fno-common',
             'CC' => 'gcc -static-libgcc',
-            'CXXFLAGS' => '-g -Os -arch^ppc -felide-constructors -fno-common',
+            'CXXFLAGS' => '-Os -arch^ppc -felide-constructors -fno-common',
             'CXX' => 'g++ -static-libgcc',
         },
         'opt' => {
@@ -836,9 +848,9 @@
 #
     'osx10.3-powerpc-32bit' => {
         'env' => {
-            'CFLAGS' => '-g -O3 -fno-common',
+            'CFLAGS' => '-O3 -fno-common',
             'CC' => 'gcc -static-libgcc',
-            'CXXFLAGS' => '-g -O3 -fno-common',
+            'CXXFLAGS' => '-O3 -fno-common',
             'CXX' => 'g++ -static-libgcc',
         },
         'opt' => {
@@ -852,10 +864,10 @@
 #
     'qnx6.2.1-x86' => {
         'env' => {
-            'CFLAGS' => '-g -O1 -D_FILE_OFFSET_BITS=64 -Wl,-E',
+            'CFLAGS' => '-O1 -D_FILE_OFFSET_BITS=64 -Wl,-E',
             'CC' => 'qcc',
             'CONFIG_SHELL' => '/usr/bin/bash',
-            'CXXFLAGS' => '-g -O1 -D_FILE_OFFSET_BITS=64 -Wl,-E',
+            'CXXFLAGS' => '-O1 -D_FILE_OFFSET_BITS=64 -Wl,-E',
             'CXX' => 'qcc',
         },
         'opt' => {
@@ -884,14 +896,15 @@
 #
     'hpux11.31-hppa-32bit' => {
         'env' => {
-            'CFLAGS' => '-g +O1 +DAportable',
+            'CFLAGS' => '+O1 +DAportable',
             'CC' => 'cc',
             'CPPFLAGS' => '-DDEFAULT_THREAD_STACK=262144',
-            'CXXFLAGS' => '-g +O1 +DAportable -Aa',
+            'CXXFLAGS' => '+O1 +DAportable -Aa',
             'CXX' => 'aCC',
             'INSTALL' => '/usr/local/bin/install',
         },
         'opt' => {
+            '!--with-libevent' => undef,
             '!--with-ssl' => undef,
         },
     },
@@ -901,10 +914,10 @@
 #
     'hpux11.11-hppa-32bit' => {
         'env' => {
-            'CFLAGS' => '-g +O1 +DAportable',
+            'CFLAGS' => '+O1 +DAportable',
             'CC' => 'cc',
             'CPPFLAGS' => '-DDEFAULT_THREAD_STACK=262144',
-            'CXXFLAGS' => '-g +O1 +DAportable -Aa',
+            'CXXFLAGS' => '+O1 +DAportable -Aa',
             'CXX' => 'aCC',
             'INSTALL' => '/usr/local/bin/install',
         },
@@ -936,13 +949,14 @@
 #
     'hpux11.23-ia64' => {
         'env' => {
-            'CFLAGS' => '-g +O2 +DD64 +DSitanium2 -mt -AC99 -DPTHREAD_COMPAT_MODE -O1',
+            'CFLAGS' => '+O2 +DD64 +DSitanium2 -mt -AC99 -DPTHREAD_COMPAT_MODE',
             'CC' => 'cc',
             'LDFLAGS' => '+DD64',
-            'CXXFLAGS' => '-g +O2 +DD64 +DSitanium2 -mt -DPTHREAD_COMPAT_MODE -O1 -Aa',
+            'CXXFLAGS' => '+O2 +DD64 +DSitanium2 -mt -DPTHREAD_COMPAT_MODE -Aa',
             'CXX' => 'aCC',
         },
         'opt' => {
+            '!--with-libevent' => undef,
             '!--with-ssl' => undef,
         },
     },

Thread
bzr push into mysql-6.0 branch (jperkin:2796 to 2797)Jonathan Perkin27 Jan