[SCM] libzn-poly: library for polynomial arithmetic in Z/nZ[x] branch, master, updated. upstream/0.9-17-gbd9f8ab

Tobias Hansen tobias.han at gmx.de
Thu Dec 20 22:51:59 UTC 2012


The following commit has been merged in the master branch:
commit bd9f8ab02d2e7bccdaac6e98227d2841823817b2
Author: Tobias Hansen <tobias.han at gmx.de>
Date:   Thu Dec 20 23:51:31 2012 +0100

    Make zn_poly_soname.patch smaller.

diff --git a/debian/patches/zn_poly_soname.patch b/debian/patches/zn_poly_soname.patch
index 0651b55..8d76ff7 100644
--- a/debian/patches/zn_poly_soname.patch
+++ b/debian/patches/zn_poly_soname.patch
@@ -1,15 +1,16 @@
 --- a/makemakefile.py
 +++ b/makemakefile.py
-@@ -161,6 +161,8 @@
+@@ -160,7 +160,8 @@
+ print "install:"
  print "\tmkdir -p %s/include/zn_poly" % prefix
  print "\tmkdir -p %s/lib" % prefix
- print "\tcp libzn_poly.a %s/lib" % prefix
+-print "\tcp libzn_poly.a %s/lib" % prefix
 +print "\tcp libzn_poly-*.so %s/lib" % prefix
 +print "\tln -s %s/lib/lib`cat DIRNAME`.so %s/lib/libzn_poly.so" % (prefix, prefix)
  print "\tcp include/zn_poly.h %s/include/zn_poly" % prefix
  print "\tcp include/wide_arith.h %s/include/zn_poly" % prefix
  print
-@@ -181,7 +183,9 @@
+@@ -181,7 +182,9 @@
     print "\trm -f " + x + "-ntl"
  for x in demo_progs:
     print "\trm -f " + x
@@ -20,19 +21,8 @@
  
  print
  print
-@@ -199,11 +203,16 @@
- 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 "libzn_poly.so: "
-+print "\trm -f *.o"
-+print "\tmake shobjs"
-+print "\t$(CC) $(CFLAGS) $(LDFLAGS) -shared -Wl,-soname,lib`cat DIRNAME`.so -o lib`cat DIRNAME`.so $(LIBOBJS) $(LIBS)"
-+print "\tln -s lib`cat DIRNAME`.so libzn_poly.so"
-+print
-+print "shobjs: $(LIBOBJS)"
+@@ -203,7 +206,7 @@
+ print "\t$(CC) -shared -o libzn_poly.so $(LIBOBJS) $(LIBS)"
  print
  print "libzn_poly-%s.so: $(LIBOBJS)" % version
 -print "\t$(CC) -shared -Wl,-soname,libzn_poly-%s.so " \
@@ -40,7 +30,3 @@
        "-o libzn_poly-%s.so $(LIBOBJS) $(LIBS)" % (version, version)
  print "\t ln -sf libzn_poly-%s.so libzn_poly.so" % version
  
---- /dev/null
-+++ b/DIRNAME
-@@ -0,0 +1 @@
-+zn_poly-0.9
diff --git a/debian/rules b/debian/rules
index fde54ce..36d7d73 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,8 +12,7 @@ override_dh_auto_configure:
             --prefix="$(CURDIR)/debian/tmp/usr" --cflags="$(CFLAGS) $(CPPFLAGS) -fPIC" --ldflags="$(LDFLAGS)"
 
 override_dh_auto_build:
-	$(MAKE)
-	$(MAKE) libzn_poly.so
+	$(MAKE) libzn_poly-0.9.so
 
 #override_dh_auto_test:
 #	$(MAKE) test

-- 
libzn-poly: library for polynomial arithmetic in Z/nZ[x]



More information about the debian-science-commits mailing list