rpms/Macaulay2/devel Macaulay2-0.9.95-cflags.patch, NONE, 1.1 Macaulay2-0.9.95-gc7.patch, NONE, 1.1 Macaulay2.spec, 1.32, 1.33

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	Macaulay2.spec 
Added Files:
	Macaulay2-0.9.95-cflags.patch Macaulay2-0.9.95-gc7.patch 
Log Message:
* Tue Aug 21 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.9.95-6
- gc-7.0 patches


Macaulay2-0.9.95-cflags.patch:

--- NEW FILE Macaulay2-0.9.95-cflags.patch ---
diff -up Macaulay2-0.9.95/Macaulay2/c/Makefile.in.cflags Macaulay2-0.9.95/Macaulay2/c/Makefile.in
--- Macaulay2-0.9.95/Macaulay2/c/Makefile.in.cflags	2006-07-06 10:16:05.000000000 -0500
+++ Macaulay2-0.9.95/Macaulay2/c/Makefile.in	2007-08-21 16:59:02.000000000 -0500
@@ -26,7 +26,7 @@ CPPFLAGS += -I at srcdir@
 scc1 : $(OFILES)
 	$(LINK.o) $^ $(LOADLIBES) $(LDLIBS) $(OUTPUT_OPTION)
 $(OFILES) : $(HFILES)
-grammar.o : grammar.c; $(CC) $(CPPFLAGS) -c $< $(OUTPUT_OPTION)
+grammar.o : grammar.c; $(CC) $(CPPFLAGS) $(CFLAGS) -c $< $(OUTPUT_OPTION)
 ############################## tags
 all :: tags
 tags : @srcdir@/TAGS

Macaulay2-0.9.95-gc7.patch:

--- NEW FILE Macaulay2-0.9.95-gc7.patch ---
diff -up Macaulay2-0.9.95/Macaulay2/d/actors2.d.gc7 Macaulay2-0.9.95/Macaulay2/d/actors2.d
--- Macaulay2-0.9.95/Macaulay2/d/actors2.d.gc7	2006-10-12 11:30:18.000000000 -0500
+++ Macaulay2-0.9.95/Macaulay2/d/actors2.d	2007-08-21 17:50:18.000000000 -0500
@@ -675,7 +675,7 @@ registerFinalizer(e:Expr):Expr := (
  	  when s.1 is msg:string do (
 	       msg = "[" + tostring(finalizerCount) + "]: " + msg;
 	       finalizerCount = finalizerCount + 1;
-	       Ccode(void, "GC_register_finalizer((GC_PTR)",e,".ptr_,(GC_finalization_proc)",finalizer,",",msg,",0,0)");
+	       Ccode(void, "GC_register_finalizer(",e,".ptr_,(GC_finalization_proc)",finalizer,",",msg,",0,0)");
 	       toExpr(finalizerCount))
      	  else WrongArgString(2))
      else WrongNumArgs(2));
diff -up Macaulay2-0.9.95/configure.ac.gc7 Macaulay2-0.9.95/configure.ac
--- Macaulay2-0.9.95/configure.ac.gc7	2006-11-04 14:12:56.000000000 -0600
+++ Macaulay2-0.9.95/configure.ac	2007-08-21 17:55:06.000000000 -0500
@@ -285,6 +285,15 @@ dnl AC_LINK_IFELSE([int main() {}],LIBPT
 AC_SUBST(FINALPREFIX)
 AC_ARG_WITH(final-prefix, AS_HELP_STRING(--with-final-prefix=...,final installation prefix (/usr) (used by debian installation scripts)), FINALPREFIX="$withval", FINALPREFIX="/usr")
 
+PKG_CHECK_MODULES(GC,bdw-gc,
+[
+GCLIB=$GC_LIBS
+AC_SUBST(GCLIB)
+CPPFLAGS="$CPPFLAGS $GC_CFLAGS"
+AC_SUBST(CPPFLAGS)
+]
+,
+[
 GCLIB="-lgc"
 AC_SUBST(GCLIB)
 AC_ARG_WITH(gclib, AS_HELP_STRING(--with-gclib=...,gc library ($GCLIB)), GCLIB="$withval")
@@ -306,6 +315,7 @@ then test "$HAVE_LIBGC_PG" = no -a "$HAV
      test "$HAVE_LIBGC_PG" = yes && GCLIB=-lgc-pg
 else test "$HAVE_LIBGC" = no && AC_MSG_ERROR([missing library: libgc])
 fi
+])
 
 GMPLIB="-lgmp"
 AC_SUBST(GMPLIB)


Index: Macaulay2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Macaulay2/devel/Macaulay2.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- Macaulay2.spec	11 Aug 2007 23:43:39 -0000	1.32
+++ Macaulay2.spec	22 Aug 2007 00:03:30 -0000	1.33
@@ -7,7 +7,7 @@
 Summary: System for algebraic geometry and commutative algebra
 Name:    Macaulay2
 Version: 0.9.95
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 License: GPLv2
 Group:   Applications/Engineering
@@ -19,16 +19,24 @@
 
 Source10: Macaulay2.png
 Source11: Macaulay2.desktop
+Source20: etags.sh
 
 Patch0: Macaulay2-0.9.8-optflags.patch
 Patch1: Macaulay2-0.9.95-xdg_open.patch 
 Patch2: Macaulay2-0.9.10-cout.patch
 Patch3: Macaulay2-0.9.95-DESTDIR.patch
 Patch4: Macaulay2-0.9.10-gcc41.patch
+Patch5: Macaulay2-0.9.95-gc7.patch
+Patch6: Macaulay2-0.9.95-cflags.patch
 Patch201739: Macaulay2-0.9.95-bz201739.patch
 
+BuildRequires: byacc
 BuildRequires: desktop-file-utils
-BuildRequires: gc-devel
+# etags
+BuildRequires: emacs-common
+BuildRequires: gc-devel 
+BuildRequires: gdbm-devel
+BuildRequires: info
 BuildRequires: ntl-devel
 BuildRequires: factory-devel 
 BuildRequires: libfac-devel 
@@ -36,17 +44,10 @@
 %if 0%{?fedora} > 3 || 0%{?rhel} > 4
 BuildRequires: lapack-devel
 %endif
-BuildRequires: gdbm-devel
 BuildRequires: readline-devel ncurses-devel
 BuildRequires: time
-BuildRequires: byacc 
-# /sbin/install-info
-BuildRequires: info
-# etags
-BuildRequires: emacs-common
-Source20: etags.sh
 
-BuildRequires: automake
+BuildRequires: automake pkgconfig
 
 Obsoletes: Macaulay2-doc < %{version}-%{release} 
 Provides:  Macaulay2-doc = %{version}-%{release}
@@ -74,15 +75,23 @@
 %patch2 -p1 -b .cout
 %patch3 -p1 -b .DESTDIR
 %patch4 -p1 -b .gcc41
+%patch5 -p1 -b .gc7
+%patch6 -p1 -b .cflags
 %patch201739 -p1 -b .bz201739
 
+aclocal
+autoconf
+
 [ -f configure -a -f include/config.h ] || make 
 
 
 %build
 
+# until gc is patched properly
+CPPFLAGS="-I%{_includedir}/gc";export CPPFLAGS
+
 # We need /sbin:. in PATH to find install-info,etags
-export PATH=/sbin:`pwd`:$PATH
+PATH=/sbin:$(pwd):$PATH; export PATH
 
 %configure  \
   --disable-encap \
@@ -177,6 +186,9 @@
 
 
 %changelog
+* Tue Aug 21 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.9.95-6
+- gc-7.0 patches
+
 * Sat Aug 11 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.9.95-5
 - License: GPLv2