rpms/Macaulay2/devel Macaulay2-0.9.95-bz201739.patch, NONE, 1.1 Macaulay2.spec, 1.29, 1.30

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/extras/rpms/Macaulay2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6397

Modified Files:
	Macaulay2.spec 
Added Files:
	Macaulay2-0.9.95-bz201739.patch 
Log Message:
* Sat Jan 06 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.9.95-3
- re-enable ppc build (#201739)


Macaulay2-0.9.95-bz201739.patch:

--- NEW FILE Macaulay2-0.9.95-bz201739.patch ---
--- Macaulay2-0.9.95/Macaulay2/d/M2lib.c~	2006-10-15 23:22:55.000000000 +0100
+++ Macaulay2-0.9.95/Macaulay2/d/M2lib.c	2006-12-28 12:59:30.000000000 +0000
@@ -368,7 +368,19 @@ char **argv;
 	       personality(oldpersonality | ADDR_NO_RANDOMIZE);
 	       newpersonality = personality(-1);
 	       personality(oldpersonality | ADDR_NO_RANDOMIZE);	/* just in case the previous line sets the personality to -1, which can happen */
-	       if ((newpersonality & ADDR_NO_RANDOMIZE) != 0) return execvp(argv[0],argv);
+	       if ((newpersonality & ADDR_NO_RANDOMIZE) != 0) {
+		       /* Sometimes the personality isn't inherited.
+			  Prevent endless loops by adding --no-personality to
+			  the command line */
+		       char **new_argv = malloc((argc+2) * sizeof(char *));
+		       if (!new_argv) fatal("out of memory");
+
+		       new_argv[0] = argv[0];
+		       new_argv[1] = "--no-personality";
+		       memcpy(&new_argv[2], &argv[1], sizeof(char *) * (argc));
+		       
+		       return execvp(new_argv[0],new_argv);
+	       }
 	  }
 	  else personality(oldpersonality);
      }


Index: Macaulay2.spec
===================================================================
RCS file: /cvs/extras/rpms/Macaulay2/devel/Macaulay2.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- Macaulay2.spec	18 Dec 2006 21:51:13 -0000	1.29
+++ Macaulay2.spec	6 Jan 2007 22:49:39 -0000	1.30
@@ -7,7 +7,7 @@
 Summary: System for algebraic geometry and commutative algebra
 Name:    Macaulay2
 Version: 0.9.95
-Release: 1%{?dist}.1
+Release: 3%{?dist}
 
 License: GPL
 Group:   Applications/Engineering
@@ -16,8 +16,6 @@
 #Source0: Macaulay2-%{version}-%{beta}.tar.bz2
 Source1: Macaulay2-svn_checkout.sh
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-# ppc build currently hangs, never finishes, http://bugzilla.redhat.com/201739
-ExcludeArch: ppc
 
 Source10: Macaulay2.png
 Source11: Macaulay2.desktop
@@ -27,6 +25,7 @@
 Patch2: Macaulay2-0.9.10-cout.patch
 Patch3: Macaulay2-0.9.95-DESTDIR.patch
 Patch4: Macaulay2-0.9.10-gcc41.patch
+Patch201739: Macaulay2-0.9.95-bz201739.patch
 
 BuildRequires: desktop-file-utils
 BuildRequires: gc-devel
@@ -75,6 +74,7 @@
 %patch2 -p1 -b .cout
 %patch3 -p1 -b .DESTDIR
 %patch4 -p1 -b .gcc41
+%patch201739 -p1 -b .bz201739
 
 [ -f configure -a -f include/config.h ] || make 
 
@@ -89,6 +89,7 @@
   --disable-dumpdata \
   --disable-optimize \
   --disable-static \
+  --disable-strip \
   --with-lapacklibs="-llapack"
 
 # Not smp-safe
@@ -176,6 +177,12 @@
 
 
 %changelog
+* Sat Jan 06 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.9.95-3
+- re-enable ppc build (#201739)
+
+* Tue Jan 02 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.9.95-2
+- ./configure --disable-strip, for usable -debuginfo (#220893)
+
 * Mon Dec 18 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.95-1
 - Macaulay2-0.9.95