Package: lam
Followup-For: Bug #328206

Here is a patch to lower the optimization level of lam from -O3 to -O2.
This will hopefully resolve the m68k build problem, and debian-devel
mail seems to indicate this is a good idea for i386 as well.

I've tested this patch and confirmed that lam still builds and that
this eliminates any use of -O3.

-- System Information:
Debian Release: testing/unstable
  APT prefers testing
  APT policy: (990, 'testing'), (500, 'unstable')
Architecture: i386 (i686)
Shell:  /bin/sh linked to /bin/bash
Kernel: Linux 2.4.30
Locale: LANG=C, LC_CTYPE=C (charmap=ANSI_X3.4-1968) (ignored: LC_ALL set to C)
diff -ru lam-7.1.1/config/lam_cxx_bindings_setup.m4 
lam-7.1.1.new/config/lam_cxx_bindings_setup.m4
--- lam-7.1.1/config/lam_cxx_bindings_setup.m4  2004-09-26 08:35:24.000000000 
-0700
+++ lam-7.1.1.new/config/lam_cxx_bindings_setup.m4      2005-09-21 
21:17:50.000000000 -0700
@@ -68,7 +68,7 @@
         ;;
 
     mips-sgi-irix*)
-        OPTFLAGS="-O3"
+        OPTFLAGS="-O2"
         TEST_OPTFLAGS=$OPTFLAGS
         EXAM_OPTFLAGS=$OPTFLAGS
        ARCH=IRIX
@@ -80,7 +80,7 @@
        # like port_test.cc and request_array_test.cc.  Doh!!
 
        NOOPT="-O0"
-       OPTFLAGS="-O3"
+       OPTFLAGS="-O2"
        TEST_OPTFLAGS=$NOOPT
        EXAM_OPTFLAGS=$OPTFLAGS
 
diff -ru lam-7.1.1/config/lam_setup_cc.m4 lam-7.1.1.new/config/lam_setup_cc.m4
--- lam-7.1.1/config/lam_setup_cc.m4    2004-09-26 08:35:24.000000000 -0700
+++ lam-7.1.1.new/config/lam_setup_cc.m4        2005-09-21 21:17:50.000000000 
-0700
@@ -156,7 +156,7 @@
 # just use -O.  
 
 if test "$GCC" = yes; then
-    OPTFLAGS="-O3"
+    OPTFLAGS="-O2"
 else
     OPTFLAGS="-O"
 fi
diff -ru lam-7.1.1/config/lam_setup_cxx.m4 lam-7.1.1.new/config/lam_setup_cxx.m4
--- lam-7.1.1/config/lam_setup_cxx.m4   2004-09-26 08:35:24.000000000 -0700
+++ lam-7.1.1.new/config/lam_setup_cxx.m4       2005-09-21 21:17:50.000000000 
-0700
@@ -150,7 +150,7 @@
 
 # Same rationale for g++ as with gcc, above.
 if test "$GXX" = yes; then
-    OPTFLAGS="-O3"
+    OPTFLAGS="-O2"
 else
     OPTFLAGS="-O"
 fi
diff -ru lam-7.1.1/configure lam-7.1.1.new/configure
--- lam-7.1.1/configure 2004-09-26 12:37:08.000000000 -0700
+++ lam-7.1.1.new/configure     2005-09-21 21:17:50.000000000 -0700
@@ -4314,7 +4314,7 @@
 # just use -O.
 
 if test "$GCC" = yes; then
-    OPTFLAGS="-O3"
+    OPTFLAGS="-O2"
 else
     OPTFLAGS="-O"
 fi
@@ -8127,7 +8127,7 @@
 
 # Same rationale for g++ as with gcc, above.
 if test "$GXX" = yes; then
-    OPTFLAGS="-O3"
+    OPTFLAGS="-O2"
 else
     OPTFLAGS="-O"
 fi
@@ -25069,7 +25069,7 @@
         ;;
 
     mips-sgi-irix*)
-        OPTFLAGS="-O3"
+        OPTFLAGS="-O2"
         TEST_OPTFLAGS=$OPTFLAGS
         EXAM_OPTFLAGS=$OPTFLAGS
        ARCH=IRIX
@@ -25081,7 +25081,7 @@
        # like port_test.cc and request_array_test.cc.  Doh!!
 
        NOOPT="-O0"
-       OPTFLAGS="-O3"
+       OPTFLAGS="-O2"
        TEST_OPTFLAGS=$NOOPT
        EXAM_OPTFLAGS=$OPTFLAGS
 
diff -ru lam-7.1.1/share/ssi/boot/bproc/configure 
lam-7.1.1.new/share/ssi/boot/bproc/configure
--- lam-7.1.1/share/ssi/boot/bproc/configure    2004-09-26 12:38:29.000000000 
-0700
+++ lam-7.1.1.new/share/ssi/boot/bproc/configure        2005-09-21 
21:17:50.000000000 -0700
@@ -4168,7 +4168,7 @@
 # just use -O.
 
 if test "$GCC" = yes; then
-    OPTFLAGS="-O3"
+    OPTFLAGS="-O2"
 else
     OPTFLAGS="-O"
 fi
diff -ru lam-7.1.1/share/ssi/boot/globus/configure 
lam-7.1.1.new/share/ssi/boot/globus/configure
--- lam-7.1.1/share/ssi/boot/globus/configure   2004-09-26 12:38:38.000000000 
-0700
+++ lam-7.1.1.new/share/ssi/boot/globus/configure       2005-09-21 
21:17:50.000000000 -0700
@@ -4166,7 +4166,7 @@
 # just use -O.
 
 if test "$GCC" = yes; then
-    OPTFLAGS="-O3"
+    OPTFLAGS="-O2"
 else
     OPTFLAGS="-O"
 fi
diff -ru lam-7.1.1/share/ssi/boot/rsh/configure 
lam-7.1.1.new/share/ssi/boot/rsh/configure
--- lam-7.1.1/share/ssi/boot/rsh/configure      2004-09-26 12:38:48.000000000 
-0700
+++ lam-7.1.1.new/share/ssi/boot/rsh/configure  2005-09-21 21:17:50.000000000 
-0700
@@ -4165,7 +4165,7 @@
 # just use -O.
 
 if test "$GCC" = yes; then
-    OPTFLAGS="-O3"
+    OPTFLAGS="-O2"
 else
     OPTFLAGS="-O"
 fi
diff -ru lam-7.1.1/share/ssi/boot/slurm/configure 
lam-7.1.1.new/share/ssi/boot/slurm/configure
--- lam-7.1.1/share/ssi/boot/slurm/configure    2004-09-26 12:38:58.000000000 
-0700
+++ lam-7.1.1.new/share/ssi/boot/slurm/configure        2005-09-21 
21:17:50.000000000 -0700
@@ -4166,7 +4166,7 @@
 # just use -O.
 
 if test "$GCC" = yes; then
-    OPTFLAGS="-O3"
+    OPTFLAGS="-O2"
 else
     OPTFLAGS="-O"
 fi
diff -ru lam-7.1.1/share/ssi/boot/tm/configure 
lam-7.1.1.new/share/ssi/boot/tm/configure
--- lam-7.1.1/share/ssi/boot/tm/configure       2004-09-26 12:39:08.000000000 
-0700
+++ lam-7.1.1.new/share/ssi/boot/tm/configure   2005-09-21 21:17:50.000000000 
-0700
@@ -4166,7 +4166,7 @@
 # just use -O.
 
 if test "$GCC" = yes; then
-    OPTFLAGS="-O3"
+    OPTFLAGS="-O2"
 else
     OPTFLAGS="-O"
 fi
diff -ru lam-7.1.1/share/ssi/coll/impi/configure 
lam-7.1.1.new/share/ssi/coll/impi/configure
--- lam-7.1.1/share/ssi/coll/impi/configure     2004-09-26 12:39:18.000000000 
-0700
+++ lam-7.1.1.new/share/ssi/coll/impi/configure 2005-09-21 21:17:50.000000000 
-0700
@@ -4166,7 +4166,7 @@
 # just use -O.
 
 if test "$GCC" = yes; then
-    OPTFLAGS="-O3"
+    OPTFLAGS="-O2"
 else
     OPTFLAGS="-O"
 fi
diff -ru lam-7.1.1/share/ssi/coll/lam_basic/configure 
lam-7.1.1.new/share/ssi/coll/lam_basic/configure
--- lam-7.1.1/share/ssi/coll/lam_basic/configure        2004-09-26 
12:39:28.000000000 -0700
+++ lam-7.1.1.new/share/ssi/coll/lam_basic/configure    2005-09-21 
21:17:50.000000000 -0700
@@ -4166,7 +4166,7 @@
 # just use -O.
 
 if test "$GCC" = yes; then
-    OPTFLAGS="-O3"
+    OPTFLAGS="-O2"
 else
     OPTFLAGS="-O"
 fi
diff -ru lam-7.1.1/share/ssi/coll/shmem/configure 
lam-7.1.1.new/share/ssi/coll/shmem/configure
--- lam-7.1.1/share/ssi/coll/shmem/configure    2004-09-26 12:39:37.000000000 
-0700
+++ lam-7.1.1.new/share/ssi/coll/shmem/configure        2005-09-21 
21:17:50.000000000 -0700
@@ -4166,7 +4166,7 @@
 # just use -O.
 
 if test "$GCC" = yes; then
-    OPTFLAGS="-O3"
+    OPTFLAGS="-O2"
 else
     OPTFLAGS="-O"
 fi
diff -ru lam-7.1.1/share/ssi/coll/smp/configure 
lam-7.1.1.new/share/ssi/coll/smp/configure
--- lam-7.1.1/share/ssi/coll/smp/configure      2004-09-26 12:39:47.000000000 
-0700
+++ lam-7.1.1.new/share/ssi/coll/smp/configure  2005-09-21 21:17:50.000000000 
-0700
@@ -4164,7 +4164,7 @@
 # just use -O.
 
 if test "$GCC" = yes; then
-    OPTFLAGS="-O3"
+    OPTFLAGS="-O2"
 else
     OPTFLAGS="-O"
 fi
diff -ru lam-7.1.1/share/ssi/crlam/blcr/configure 
lam-7.1.1.new/share/ssi/crlam/blcr/configure
--- lam-7.1.1/share/ssi/crlam/blcr/configure    2004-09-26 12:39:58.000000000 
-0700
+++ lam-7.1.1.new/share/ssi/crlam/blcr/configure        2005-09-21 
21:17:50.000000000 -0700
@@ -4173,7 +4173,7 @@
 # just use -O.
 
 if test "$GCC" = yes; then
-    OPTFLAGS="-O3"
+    OPTFLAGS="-O2"
 else
     OPTFLAGS="-O"
 fi
diff -ru lam-7.1.1/share/ssi/crlam/self/configure 
lam-7.1.1.new/share/ssi/crlam/self/configure
--- lam-7.1.1/share/ssi/crlam/self/configure    2004-09-26 12:40:08.000000000 
-0700
+++ lam-7.1.1.new/share/ssi/crlam/self/configure        2005-09-21 
21:17:50.000000000 -0700
@@ -4178,7 +4178,7 @@
 # just use -O.
 
 if test "$GCC" = yes; then
-    OPTFLAGS="-O3"
+    OPTFLAGS="-O2"
 else
     OPTFLAGS="-O"
 fi
@@ -5477,7 +5477,7 @@
 
 # Same rationale for g++ as with gcc, above.
 if test "$GXX" = yes; then
-    OPTFLAGS="-O3"
+    OPTFLAGS="-O2"
 else
     OPTFLAGS="-O"
 fi
diff -ru lam-7.1.1/share/ssi/crmpi/blcr/configure 
lam-7.1.1.new/share/ssi/crmpi/blcr/configure
--- lam-7.1.1/share/ssi/crmpi/blcr/configure    2004-09-26 12:40:18.000000000 
-0700
+++ lam-7.1.1.new/share/ssi/crmpi/blcr/configure        2005-09-21 
21:17:50.000000000 -0700
@@ -4171,7 +4171,7 @@
 # just use -O.
 
 if test "$GCC" = yes; then
-    OPTFLAGS="-O3"
+    OPTFLAGS="-O2"
 else
     OPTFLAGS="-O"
 fi
diff -ru lam-7.1.1/share/ssi/crmpi/self/configure 
lam-7.1.1.new/share/ssi/crmpi/self/configure
--- lam-7.1.1/share/ssi/crmpi/self/configure    2004-09-26 12:40:29.000000000 
-0700
+++ lam-7.1.1.new/share/ssi/crmpi/self/configure        2005-09-21 
21:17:50.000000000 -0700
@@ -4176,7 +4176,7 @@
 # just use -O.
 
 if test "$GCC" = yes; then
-    OPTFLAGS="-O3"
+    OPTFLAGS="-O2"
 else
     OPTFLAGS="-O"
 fi
@@ -5475,7 +5475,7 @@
 
 # Same rationale for g++ as with gcc, above.
 if test "$GXX" = yes; then
-    OPTFLAGS="-O3"
+    OPTFLAGS="-O2"
 else
     OPTFLAGS="-O"
 fi
diff -ru lam-7.1.1/share/ssi/rpi/crtcp/configure 
lam-7.1.1.new/share/ssi/rpi/crtcp/configure
--- lam-7.1.1/share/ssi/rpi/crtcp/configure     2004-09-26 12:40:39.000000000 
-0700
+++ lam-7.1.1.new/share/ssi/rpi/crtcp/configure 2005-09-21 21:17:50.000000000 
-0700
@@ -4170,7 +4170,7 @@
 # just use -O.
 
 if test "$GCC" = yes; then
-    OPTFLAGS="-O3"
+    OPTFLAGS="-O2"
 else
     OPTFLAGS="-O"
 fi
diff -ru lam-7.1.1/share/ssi/rpi/gm/configure 
lam-7.1.1.new/share/ssi/rpi/gm/configure
--- lam-7.1.1/share/ssi/rpi/gm/configure        2004-09-26 12:40:50.000000000 
-0700
+++ lam-7.1.1.new/share/ssi/rpi/gm/configure    2005-09-21 21:17:50.000000000 
-0700
@@ -4187,7 +4187,7 @@
 # just use -O.
 
 if test "$GCC" = yes; then
-    OPTFLAGS="-O3"
+    OPTFLAGS="-O2"
 else
     OPTFLAGS="-O"
 fi
@@ -5486,7 +5486,7 @@
 
 # Same rationale for g++ as with gcc, above.
 if test "$GXX" = yes; then
-    OPTFLAGS="-O3"
+    OPTFLAGS="-O2"
 else
     OPTFLAGS="-O"
 fi
diff -ru lam-7.1.1/share/ssi/rpi/ib/configure 
lam-7.1.1.new/share/ssi/rpi/ib/configure
--- lam-7.1.1/share/ssi/rpi/ib/configure        2004-09-26 12:41:00.000000000 
-0700
+++ lam-7.1.1.new/share/ssi/rpi/ib/configure    2005-09-21 21:17:50.000000000 
-0700
@@ -4185,7 +4185,7 @@
 # just use -O.
 
 if test "$GCC" = yes; then
-    OPTFLAGS="-O3"
+    OPTFLAGS="-O2"
 else
     OPTFLAGS="-O"
 fi
@@ -5484,7 +5484,7 @@
 
 # Same rationale for g++ as with gcc, above.
 if test "$GXX" = yes; then
-    OPTFLAGS="-O3"
+    OPTFLAGS="-O2"
 else
     OPTFLAGS="-O"
 fi
diff -ru lam-7.1.1/share/ssi/rpi/lamd/configure 
lam-7.1.1.new/share/ssi/rpi/lamd/configure
--- lam-7.1.1/share/ssi/rpi/lamd/configure      2004-09-26 12:41:10.000000000 
-0700
+++ lam-7.1.1.new/share/ssi/rpi/lamd/configure  2005-09-21 21:17:50.000000000 
-0700
@@ -4164,7 +4164,7 @@
 # just use -O.
 
 if test "$GCC" = yes; then
-    OPTFLAGS="-O3"
+    OPTFLAGS="-O2"
 else
     OPTFLAGS="-O"
 fi
diff -ru lam-7.1.1/share/ssi/rpi/sysv/configure 
lam-7.1.1.new/share/ssi/rpi/sysv/configure
--- lam-7.1.1/share/ssi/rpi/sysv/configure      2004-09-26 12:41:20.000000000 
-0700
+++ lam-7.1.1.new/share/ssi/rpi/sysv/configure  2005-09-21 21:17:50.000000000 
-0700
@@ -4184,7 +4184,7 @@
 # just use -O.
 
 if test "$GCC" = yes; then
-    OPTFLAGS="-O3"
+    OPTFLAGS="-O2"
 else
     OPTFLAGS="-O"
 fi
diff -ru lam-7.1.1/share/ssi/rpi/tcp/configure 
lam-7.1.1.new/share/ssi/rpi/tcp/configure
--- lam-7.1.1/share/ssi/rpi/tcp/configure       2004-09-26 12:41:30.000000000 
-0700
+++ lam-7.1.1.new/share/ssi/rpi/tcp/configure   2005-09-21 21:17:50.000000000 
-0700
@@ -4168,7 +4168,7 @@
 # just use -O.
 
 if test "$GCC" = yes; then
-    OPTFLAGS="-O3"
+    OPTFLAGS="-O2"
 else
     OPTFLAGS="-O"
 fi
diff -ru lam-7.1.1/share/ssi/rpi/usysv/configure 
lam-7.1.1.new/share/ssi/rpi/usysv/configure
--- lam-7.1.1/share/ssi/rpi/usysv/configure     2004-09-26 12:41:40.000000000 
-0700
+++ lam-7.1.1.new/share/ssi/rpi/usysv/configure 2005-09-21 21:17:50.000000000 
-0700
@@ -4184,7 +4184,7 @@
 # just use -O.
 
 if test "$GCC" = yes; then
-    OPTFLAGS="-O3"
+    OPTFLAGS="-O2"
 else
     OPTFLAGS="-O"
 fi
diff -ru lam-7.1.1/share/totalview/configure 
lam-7.1.1.new/share/totalview/configure
--- lam-7.1.1/share/totalview/configure 2004-09-26 08:57:26.000000000 -0700
+++ lam-7.1.1.new/share/totalview/configure     2005-09-21 21:17:50.000000000 
-0700
@@ -3949,7 +3949,7 @@
 # just use -O.
 
 if test "$GCC" = yes; then
-    OPTFLAGS="-O3"
+    OPTFLAGS="-O2"
 else
     OPTFLAGS="-O"
 fi

Reply via email to