Ticket #11227: cliquer-1.2.p7-p8.diff

SPKG.txt

@@ -24 +24 @@
 
 == Changelog ==
 
+=== cliquer-1.2.p8 (Jeroen Demeyer, 25 April 2011) ===
+ * #11227: When compiling with gcc 4.6.0, add compiler flag -fno-ivopts
+   to work around a gcc bug.
+ * Use `patch` for patching the Makefile and put patches/Makefile.patch
+   under hg control.
+ * Some minor cleanup of spkg-install and Makefile.
+
 === cliquer-1.2.p7 David Kirkby, Leif Leonhardy  (14 September 2010) ===
  * #9871 Change flags passed to the linker on Solaris to avoid problems with the 
    link-editor believing the shared library contains text relocations. This 

new file patches/Makefile.patch

@@ +1 @@
+diff -ur src/Makefile src.patched/Makefile
+--- src/Makefile        2010-02-16 05:26:57.000000000 +0100
++++ src.patched/Makefile        2011-04-26 09:46:41.000000000 +0200
+@@ -1,14 +1,17 @@
+ 
+ ##### Configurable options:
+ 
++# Don't need to set any of these compiler variables. They have already been
++# set when running SAGE_ROOT/local/bin/sage-env as part of installing a
++# package.
+ ## Compiler:
+-CC=gcc
++#CC=gcc
+ #CC=cc
+ 
+ ## Compiler flags:
+ 
+ # GCC:  (also -march=pentium etc, for machine-dependent optimizing)
+-CFLAGS=-Wall -O3 -fomit-frame-pointer -funroll-loops
++#CFLAGS=-Wall -O3 -fomit-frame-pointer -funroll-loops
+ 
+ # GCC w/ debugging:
+ #CFLAGS=-Wall -g -DINLINE=
+@@ -29,14 +32,14 @@
+ ##### End of configurable options
+ 
+ 
+-all: cl
++all: libcliquer.so
+ 
+ 
+ testcases: testcases.o cliquer.o graph.o reorder.o
+        $(CC) $(LDFLAGS) -o $@ testcases.o cliquer.o graph.o reorder.o
+ 
+-cl: cl.o cliquer.o graph.o reorder.o
+-       $(CC) $(LDFLAGS) -o $@ cl.o cliquer.o graph.o reorder.o
++libcliquer.so: cl.o cliquer.o graph.o reorder.o
++       $(CC) $(LDFLAGS) $(SAGESOFLAGS) -o $@ cl.o cliquer.o graph.o reorder.o
+ 
+ 
+ cl.o testcases.o cliquer.o graph.o reorder.o: cliquer.h set.h graph.h misc.h reorder.h Makefile cliquerconf.h

spkg-install

@@ -12 +12 @@
 
 # Add a sensible default optimisation flag. Change if necessary.
 OPTIMIZATION_FLAGS="-O2"
+# Work around a bug in gcc 4.6.0, probably http://gcc.gnu.org/bugzilla/show_bug.cgi?id=48702
+if [ "x`$SAGE_LOCAL/bin/testcc.sh $CC`" = xGCC ] && [ "x`$CC -dumpversion 2>/dev/null`" = x4.6.0 ] ; then
+    echo "Warning: Working around bug in gcc 4.6.0"
+    OPTIMIZATION_FLAGS="$OPTIMIZATION_FLAGS -fno-ivopts"
+fi
 
 # Most packages do not need all these set. But it is better to do them all
 # each time, rather than omit a flag by mistake.
@@ -148 +153 @@
 SAGESOFLAGS=" "
 if [ "$UNAME" = "Linux" ] || [ "$UNAME" = "FreeBSD" ]; then
     SAGESOFLAGS="-shared -Wl,-soname,libcliquer.so"
-    export SAGESOFLAGS
 elif [ "$UNAME" = "Darwin" ]; then
     MACOSX_DEPLOYMENT_TARGET="10.3"
     export MACOSX_DEPLOYMENT_TARGET
     SAGESOFLAGS="-dynamiclib -single_module -flat_namespace -undefined dynamic_lookup"
-    export SAGESOFLAGS
 elif [ "$UNAME" = "SunOS" ]; then
     SAGESOFLAGS="-shared -Wl,-h,libcliquer.so -Wl,-ztext"
-    export SAGESOFLAGS
 elif [ "$UNAME" = "CYGWIN" ]; then
     SAGESOFLAGS="-shared -Wl,-soname,libcliquer.so"
-    export SAGESOFLAGS
 else
     echo "Cannot determine your platform or it is not supported"
     echo "Since SAGE_PORT is set, setting SAGESOFLAGS to Linux defaults."
     SAGESOFLAGS="-shared -Wl,-soname,libcliquer.so"
-    export SAGESOFLAGS
 fi
+export SAGESOFLAGS
 
-# Copy over custom Makefile for Sage. This custom Makefile contains Sage
+cd src
+
+# Patch the Makefile for Sage. This custom Makefile contains Sage
 # specific compilation and linking flags. More importantly, we're building
 # cliquer as a dynamic shared library, instead of a stand alone program.
-cp -f patch/Makefile src/
-
-cd src
+patch -p1 <../patches/Makefile.patch
 
 #Do not exit script if there is an error, but instead print an
 # informative error message.