Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci
In directory vz-cvs-3.sog:/tmp/cvs-serv11943
Modified Files:
prover9.info prover9.patch
Log Message:
Tweak the prover9 build process: with parallel builds, it failed.
The upstream build setup is a mess.
Index: prover9.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci/prover9.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- prover9.patch 12 Aug 2011 12:05:35 -0000 1.1
+++ prover9.patch 10 Oct 2012 14:59:03 -0000 1.2
@@ -1,33 +1,105 @@
-diff -Naur --exclude='*~' LADR-2009-11A/Makefile LADR-2009-11A.fink/Makefile
---- LADR-2009-11A/Makefile 2007-10-22 22:33:12.000000000 +0100
-+++ LADR-2009-11A.fink/Makefile 2010-03-08 15:33:57.000000000 +0000
-@@ -6,7 +6,7 @@
- cd mace4.src && $(MAKE) all
- cd provers.src && $(MAKE) all
- cd apps.src && $(MAKE) all
+diff -Naur '--exclude=*~' LADR-2009-11A/Makefile LADR-2009-11A.fink/Makefile
+--- LADR-2009-11A/Makefile 2007-10-22 23:33:12.000000000 +0200
++++ LADR-2009-11A.fink/Makefile 2012-10-10 16:38:54.000000000 +0200
+@@ -2,11 +2,11 @@
+ @echo See README.make
+
+ all:
+- cd ladr && $(MAKE) lib
+- cd mace4.src && $(MAKE) all
+- cd provers.src && $(MAKE) all
+- cd apps.src && $(MAKE) all
- /bin/cp -p utilities/* bin
-+ find utilities -type f -exec cp {} @PREFIX@/bin ";";
++ $(MAKE) -C ladr lib
++ $(MAKE) -C mace4.src all
++ $(MAKE) -C provers.src all
++ $(MAKE) -C apps.src all
++ find utilities -type f -exec cp {} @PREFIX@/bin ';'
@echo ""
@echo "**** Now try 'make test1'. ****"
@echo ""
-@@ -33,7 +33,7 @@
+@@ -33,10 +33,8 @@
@echo ""
@echo "*** If you see 5 interpretations, the apps are probably okay.
***"
@echo ""
- @echo "*** All of the programs are in ./bin, and they can be copied
anywhere you like. ***"
-+ @echo "*** All of the programs are in @PREXI@/bin, and they can be
copied anywhere you like. ***"
- @echo ""
+- @echo ""
- clean:
-diff -Naur --exclude='*~' LADR-2009-11A/provers.src/ladr_to_tptp.c
LADR-2009-11A.fink/provers.src/ladr_to_tptp.c
---- LADR-2009-11A/provers.src/ladr_to_tptp.c 2009-06-29 18:51:25.000000000
+0100
-+++ LADR-2009-11A.fink/provers.src/ladr_to_tptp.c 2010-03-08
15:20:34.000000000 +0000
+-clean:
++clean:
+ cd ladr && $(MAKE) realclean
+ cd apps.src && $(MAKE) realclean
+ cd mace4.src && $(MAKE) realclean
+diff -Naur '--exclude=*~' LADR-2009-11A/mace4.src/Makefile
LADR-2009-11A.fink/mace4.src/Makefile
+--- LADR-2009-11A/mace4.src/Makefile 2009-04-17 16:46:46.000000000 +0200
++++ LADR-2009-11A.fink/mace4.src/Makefile 2012-10-10 16:46:35.000000000
+0200
+@@ -1,5 +1,7 @@
+ # LADR/mace4.src
+
++.PHONY: all lib install clean realclean
++
+ CC = gcc
+
+ # XFLAGS can be specified on the command line (see XFLAGS below)
+@@ -43,5 +45,5 @@
+ realclean:
+ /bin/rm -f *.o *.a mace4
+
+-install:
+- /bin/mv mace4 ../bin
++install: mace4
++ cp mace4 ../bin
+diff -Naur '--exclude=*~' LADR-2009-11A/provers.src/Makefile
LADR-2009-11A.fink/provers.src/Makefile
+--- LADR-2009-11A/provers.src/Makefile 2009-10-28 15:22:15.000000000 +0100
++++ LADR-2009-11A.fink/provers.src/Makefile 2012-10-10 16:35:39.000000000
+0200
+@@ -1,5 +1,7 @@
+ # LADR/prover9.src
+
++.PHONY: all install clean libs
++
+ CC = gcc
+
+ # XFLAGS can be specified on the command line (see XFLAGS below)
+@@ -33,14 +35,14 @@
+ libs: ladr libmace4
+
+ ladr libladr:
+- cd ../ladr && $(MAKE) libladr
++ $(MAKE) -C ../ladr libladr
+ $(MAKE) clean
+
+ libmace libmace4:
+- cd ../mace4.src && $(MAKE) libmace4
++ $(MAKE) -C ../mace4.src libmace4
+ $(MAKE) clean
+
+-install:
++install: $(PROGRAMS)
+ /bin/cp -p $(PROGRAMS) ../bin
+
+ clean:
+diff -Naur '--exclude=*~' LADR-2009-11A/provers.src/ladr_to_tptp.c
LADR-2009-11A.fink/provers.src/ladr_to_tptp.c
+--- LADR-2009-11A/provers.src/ladr_to_tptp.c 2009-06-29 19:51:25.000000000
+0200
++++ LADR-2009-11A.fink/provers.src/ladr_to_tptp.c 2012-10-10
15:54:53.000000000 +0200
@@ -40,7 +40,7 @@
/* This is similar to the way Prover9 initializes and reads its input. */
- input = std_prover_init_and_input(0, NULL,
-+ input = std_prover_init_and_input(1, argv, // ignore command-line args
++ input = std_prover_init_and_input(1, argv,
FALSE, // clausify formulas
FALSE, // echo input to stdout
IGNORE_UNKNOWN); // for unknown flags/parms
+@@ -89,10 +89,10 @@
+ printf("\n");
+ for (p = all; p; p = p->next) {
+ Term t = p->v;
+- ARG(t,2) = replace_bad_tptp_syms_form(ARG(t,2),
++ ARG(t,2) = replace_bad_tptp_syms_form(ARG(t,2),
+ str_ident(sn_to_str(SYMNUM(t)),"cnf"),
+ map);
+-
++
+ }
+ }
+
Index: prover9.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci/prover9.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- prover9.info 12 Aug 2011 12:05:35 -0000 1.1
+++ prover9.info 10 Oct 2012 14:59:03 -0000 1.2
@@ -3,7 +3,7 @@
Description: Prove theorems and build models
Version: 2009-11a
Type: w (2009-11A)
-Revision: 3
+Revision: 4
License: OSI-Approved
BuildDepends: fink (>= 0.24.12)
Source: http://www.cs.unm.edu/~mccune/prover9/download/LADR-%type_raw[w].tar.gz
@@ -13,13 +13,13 @@
Source2-MD5: 23fbb9c6b3cbfbb2b893fb788e248a29
Source2ExtractDir: LADR-%type_raw[w]
PatchFile: %n.patch
-PatchFile-MD5: 9118398fbe396580b4cc98303d8baa7b
+PatchFile-MD5: 9c9ce8cf46b3c7f74152cb1fdd0b1909
PatchScript: sed 's|@PREFIX@|%i|g' < %{PatchFile} | patch -p1
CompileScript: <<
- make all
- make test1
- make test2
- make test3
+ make -j 1 all
+ make -j 1 test1
+ make -j 1 test2
+ make -j 1 test3
<<
InstallScript: <<
mkdir -p %i/share/xml/xsl
------------------------------------------------------------------------------
Don't let slow site performance ruin your business. Deploy New Relic APM
Deploy New Relic app performance management and know exactly
what is happening inside your Ruby, Python, PHP, Java, and .NET app
Try New Relic at no cost today and get our sweet Data Nerd shirt too!
http://p.sf.net/sfu/newrelic-dev2dev
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
