Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c491d35277ebc15e29eb0ec8c76cfe9dea63e448
commit c491d35277ebc15e29eb0ec8c76cfe9dea63e448 Author: Elentir <elen...@frugalware.org> Date: Mon Oct 18 18:24:59 2010 +0200 coq-8.3-1-i686 * version bump * fix depends * add coq-make-3.82.patch diff --git a/source/xapps-extra/coq/FrugalBuild b/source/xapps-extra/coq/FrugalBuild index f68723a..a50dc6c 100644 --- a/source/xapps-extra/coq/FrugalBuild +++ b/source/xapps-extra/coq/FrugalBuild @@ -2,23 +2,24 @@ # Maintainer: Elentir <elen...@frugalware.org> pkgname=coq -pkgver=8.2pl2 -pkgrel=2 +pkgver=8.3 +pkgrel=1 pkgdesc="Coq is a formal proof management system" url="http://coq.inria.fr/"; -source=("$url/distrib/V$pkgver/files/$pkgname-$pkgver.tar.gz") -depends=('gtk+2') +source=("$url/distrib/V$pkgver/files/$pkgname-$pkgver.tar.gz" coq-make-3.82.patch) +depends=('gtk+2-libs' 'gdk-pixbuf2') makedepends=('ocaml>=3.11.1' 'lablgtk2' 'camlp5') options=('scriptlet' 'nostrip') groups=('xapps-extra') archs=('i686' 'x86_64') up2date="Flasttar $url/download" -Fconfopts="--prefix /usr --reals all --coqide opt" +Fconfopts="--prefix /usr --mandir /usr/share/man --coqide opt" _F_desktop_name="Coqide" _F_desktop_exec="coqide" _F_desktop_categories="Science;Math;" _F_desktop_icon="$pkgname.png" -sha1sums=('97e1f3d458845cb2934fa0573521fa517994295a') +sha1sums=('6c6472b6a41429e78d979eacd8ff58bd6f6c9da4' \ + '731f8de646ffb38f390b31ff2b5ba558e3b02f90') build() { unset MAKEFLAGS diff --git a/source/xapps-extra/coq/coq-make-3.82.patch b/source/xapps-extra/coq/coq-make-3.82.patch new file mode 100644 index 0000000..1edac20 --- /dev/null +++ b/source/xapps-extra/coq/coq-make-3.82.patch @@ -0,0 +1,54 @@ +diff -Naur coq-8.3/Makefile coq-8.3/Makefile +--- coq-8.3/Makefile 2010-10-13 21:53:28.000000000 +0200 ++++ coq-8.3/Makefile 2010-10-18 13:29:41.384000036 +0200 +@@ -160,9 +160,15 @@ + stage1 $(STAGE1_TARGETS) : always + $(call stage-template,1) + ++$(STAGE1_TARGETS_IMPLICIT) : always ++ $(call stage-template,1) ++ + stage2 $(STAGE2_TARGETS) : stage1 + $(call stage-template,2) + ++$(STAGE2_TARGETS_IMPLICIT) : stage1 ++ $(call stage-template,2) ++ + # Nota: + # - world is one of the targets in $(STAGE2_TARGETS), hence launching + # "make" or "make world" leads to recursion into stage1 then stage2 +diff -Naur coq-8.3/Makefile.common coq-8.3/Makefile.common +--- coq-8.3/Makefile.common 2010-06-23 15:17:17.000000000 +0200 ++++ coq-8.3/Makefile.common 2010-10-18 13:31:29.767000038 +0200 +@@ -374,10 +374,12 @@ + STAGE1_TARGETS:= $(STAGE1) $(COQDEPBOOT) \ + $(GENFILES) \ + source-doc revision toplevel/mltop.byteml toplevel/mltop.optml \ +- $(STAGE1_ML4:.ml4=.ml4-preprocessed) %.o ++ $(STAGE1_ML4:.ml4=.ml4-preprocessed) ++ ++STAGE1_TARGETS_IMPLICIT:=%.o + + ifdef CM_STAGE1 +- STAGE1_TARGETS+=$(CAML_OBJECT_PATTERNS) ++ STAGE1_TARGETS_IMPLICIT+=$(CAML_OBJECT_PATTERNS) + endif + + ## Enumeration of targets that require being done at stage2 +@@ -402,12 +404,13 @@ + printers debug initplugins plugins \ + world install coqide coqide-files coq coqlib \ + coqlight states check init theories theories-light \ +- $(DOC_TARGETS) $(VO_TARGETS) validate \ +- %.vo %.glob states/% install-% %.ml4-preprocessed \ ++ $(DOC_TARGETS) $(VO_TARGETS) validate ++ ++STAGE2_TARGETS_IMPLICIT:=%.vo %.glob states/% install-% %.ml4-preprocessed \ + $(DOC_TARGET_PATTERNS) + + ifndef CM_STAGE1 +- STAGE2_TARGETS+=$(CAML_OBJECT_PATTERNS) ++ STAGE2_TARGETS_IMPLICIT+=$(CAML_OBJECT_PATTERNS) + endif + + _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
