# HG changeset patch
# User Jaap Spies <jaapspies@gmail.com>
# Date 1266773771 -3600
# Node ID e0849d96103e7a58467e4f2e0768ffa582ca5bd1
# Parent  e3456c607406a53aec42aa0633a39fd8c4398a3e
if SAGE64=yes we set CFLAGS appropriate. In patches/makemakefile.py we add $(LDFLAGS) when we build the shared library.

diff -r e3456c607406 -r e0849d96103e .hgignore
--- a/.hgignore	Mon Feb 15 23:39:41 2010 -0800
+++ b/.hgignore	Sun Feb 21 18:36:11 2010 +0100
@@ -1,1 +1,2 @@
 src
+patches
diff -r e3456c607406 -r e0849d96103e SPKG.txt
--- a/SPKG.txt	Mon Feb 15 23:39:41 2010 -0800
+++ b/SPKG.txt	Sun Feb 21 18:36:11 2010 +0100
@@ -24,6 +24,12 @@
 
 == Changelog ==
 
+
+=== zn_poly-0.9.p3 (Jaap Spies, February 21th, 2010) ===
+ * Ticket #8178: if SAGE64=yes we set CFLAGS appropriate. In patches/makemakefile.py we add $(LDFLAGS)
+   when we build the shared library. This works for Darwin and Open Solaris.
+
+
 === zn_poly-0.9.p2 (Mike Hansen, February 15th, 2010) ===
  *  Ticket #8280: cygwin: zn_poly shared library named incorrectly on cygwin
 
diff -r e3456c607406 -r e0849d96103e patches/makemakefile.py
--- a/patches/makemakefile.py	Mon Feb 15 23:39:41 2010 -0800
+++ b/patches/makemakefile.py	Sun Feb 21 18:36:11 2010 +0100
@@ -196,7 +196,7 @@
 print "\t$(CC) -m64 -single_module -fPIC -dynamiclib -o libzn_poly.dylib $(LIBOBJS) $(LIBS)"
 print
 print "libzn_poly.so: $(LIBOBJS)"
-print "\t$(CC) -shared -Wl,-soname,libzn_poly-`cat VERSION`.so " \
+print "\t$(CC) -shared $(LDFLAGS) -Wl,-soname,libzn_poly-`cat VERSION`.so " \
       "-o libzn_poly-`cat VERSION`.so $(LIBOBJS) $(LIBS)"
 print "\t ln -sf libzn_poly-`cat VERSION`.so libzn_poly.so"
 
diff -r e3456c607406 -r e0849d96103e patches/makemakefile.py.patch
--- a/patches/makemakefile.py.patch	Mon Feb 15 23:39:41 2010 -0800
+++ b/patches/makemakefile.py.patch	Sun Feb 21 18:36:11 2010 +0100
@@ -1,12 +1,15 @@
---- makemakefile.py.orig	2008-08-19 17:13:51.000000000 -0700
-+++ makemakefile.py	2008-08-19 17:14:37.000000000 -0700
-@@ -167,6 +167,9 @@
- print "libzn_poly.dylib: $(LIBOBJS)"
- print "\t$(CC) -single_module -fPIC -dynamiclib -o libzn_poly.dylib $(LIBOBJS) $(LIBS)"
+--- ../src/makemakefile.py	2008-09-22 17:35:05.000000000 +0200
++++ makemakefile.py	2010-02-21 17:59:07.440760614 +0100
+@@ -192,8 +192,11 @@
+ print "\t$(CC) -single_module -fPIC -dynamiclib -o libzn_poly.dylib " \
+       "$(LIBOBJS) $(LIBS)"
  print
 +print "libzn_poly.dylib64: $(LIBOBJS)"
 +print "\t$(CC) -m64 -single_module -fPIC -dynamiclib -o libzn_poly.dylib $(LIBOBJS) $(LIBS)"
 +print
  print "libzn_poly.so: $(LIBOBJS)"
- print "\t$(CC) -shared -o libzn_poly.so $(LIBOBJS) $(LIBS)"
+-print "\t$(CC) -shared -Wl,-soname,libzn_poly-`cat VERSION`.so " \
++print "\t$(CC) -shared $(LDFLAGS) -Wl,-soname,libzn_poly-`cat VERSION`.so " \
+       "-o libzn_poly-`cat VERSION`.so $(LIBOBJS) $(LIBS)"
+ print "\t ln -sf libzn_poly-`cat VERSION`.so libzn_poly.so"
  
diff -r e3456c607406 -r e0849d96103e spkg-install
--- a/spkg-install	Mon Feb 15 23:39:41 2010 -0800
+++ b/spkg-install	Sun Feb 21 18:36:11 2010 +0100
@@ -12,9 +12,8 @@
    exit 1
 fi
 
-
-if [ `uname` = "Darwin" -a "$SAGE64" = "yes" ]; then
-   echo "64 bit MacIntel"
+if [ "x$SAGE64" = xyes ]; then
+   echo "64 bit build"
    CFLAGS="-O3 -g -m64 -fPIC -L."; export CFLAGS
    LDFLAGS="-m64 "; export LDFLAGS
    cp patches/makemakefile.py src/makemakefile.py