* [gentoo-commits] proj/sci:master commit in: sci-mathematics/frama-c/files/, sci-mathematics/frama-c/
@ 2011-05-11 23:50 Jonathan-Christofer Demay
0 siblings, 0 replies; 6+ messages in thread
From: Jonathan-Christofer Demay @ 2011-05-11 23:50 UTC (permalink / raw
To: gentoo-commits
commit: 62d7366e2c2d29d29a1189ee047addc5f35e7ad0
Author: Jonathan-Christofer Demay <jcdemay <AT> gmail <DOT> com>
AuthorDate: Wed May 11 23:50:24 2011 +0000
Commit: Jonathan-Christofer Demay <jcdemay <AT> gmail <DOT> com>
CommitDate: Wed May 11 23:50:24 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=62d7366e
sci-mathematics/frama-c: version bump
---
sci-mathematics/frama-c/ChangeLog | 6 +-
.../files/frama-c-20100401-plugin_install.patch | 33 ---------
sci-mathematics/frama-c/frama-c-20100401.ebuild | 71 --------------------
...101202_beta2.ebuild => frama-c-20110201.ebuild} | 29 +++-----
4 files changed, 14 insertions(+), 125 deletions(-)
diff --git a/sci-mathematics/frama-c/ChangeLog b/sci-mathematics/frama-c/ChangeLog
index 405dba0..ef202c5 100644
--- a/sci-mathematics/frama-c/ChangeLog
+++ b/sci-mathematics/frama-c/ChangeLog
@@ -2,9 +2,9 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
- 07 Mar 2011; Justin Lecher <jlec@gentoo.org> frama-c-20100401.ebuild,
- frama-c-20101202_beta2.ebuild:
- Correct Slots for gtk 3 introduction to tree
+ 06 may 2011; J.-C. Demay <jcdemay@gmail.com>
+ +frama-c-20110201.ebuild, -frama-c-20101202_beta2.ebuild:
+ version bump
14 Feb 2011; J.-C. Demay <jcdemay@gmail.com>
+frama-c-20101202_beta2.ebuild, -frama-c-20100401.ebuild, -files/frama-c-20100401-plugin_install.patch:
diff --git a/sci-mathematics/frama-c/files/frama-c-20100401-plugin_install.patch b/sci-mathematics/frama-c/files/frama-c-20100401-plugin_install.patch
deleted file mode 100644
index c5463cc..0000000
--- a/sci-mathematics/frama-c/files/frama-c-20100401-plugin_install.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -Naurp frama-c-Boron-20100401/share/Makefile.dynamic frama-c-Boron-20100401b/share/Makefile.dynamic
---- frama-c-Boron-20100401/share/Makefile.dynamic 2010-04-13 11:52:53.000000000 +0000
-+++ frama-c-Boron-20100401/share/Makefile.dynamic 2010-07-04 19:48:52.000000000 +0000
-@@ -113,7 +113,7 @@ endif #FRAMAC_MAKE
-
- PLUGIN_LIB_DIR ?= $(PLUGIN_DIR)
- PLUGIN_GUI_LIB_DIR ?= $(PLUGIN_DIR)/gui
--PLUGIN_INSTALL_DIR ?=$(FRAMAC_PLUGINDIR)
-+PLUGIN_INSTALL_DIR ?=$(DESTDIR)$(FRAMAC_PLUGINDIR)
-
- PLUGIN_FLAGS:=$(FLAGS) $(DEBUG) $(FRAMAC_INCLUDES) -I $(FRAMAC_LIBDIR)
- PLUGIN_BFLAGS:=$(PLUGIN_FLAGS) $(PLUGIN_BFLAGS)
-@@ -182,6 +182,7 @@ endif
- ifneq ($(PLUGIN_ENABLE),no)
- install::
- $(PRINT_CP) $(PLUGIN_INSTALL_DIR)
-+ $(MKDIR) $(PLUGIN_INSTALL_DIR)
- $(CP) $(TARGETS) $(PLUGIN_INSTALL_DIR)
- $(PRINT_CP) $(BINDIR)
- if [ -f frama-c-$(PLUGIN_NAME).byte$(EXE) ]; then \
-@@ -191,9 +192,9 @@ install::
- $(CP) frama-c-$(PLUGIN_NAME).$(OCAMLBEST)$(EXE) \
- $(BINDIR)/frama-c-$(PLUGIN_NAME)$(EXE); \
- fi
-- $(PRINT_UPDATE) $(FRAMAC_SHARE)/known_plugins.ac
-- echo "ENABLE_`echo $(PLUGIN_NAME) | tr "a-z" "A-Z"`=$(PLUGIN_ENABLE)" \
-- >> $(FRAMAC_SHARE)/known_plugins.ac
-+ #$(PRINT_UPDATE) $(FRAMAC_SHARE)/known_plugins.ac
-+ #echo "ENABLE_`echo $(PLUGIN_NAME) | tr "a-z" "A-Z"`=$(PLUGIN_ENABLE)" \
-+ # >> $(FRAMAC_SHARE)/known_plugins.ac
- ifeq ($(HAS_GUI),yes)
- $(PRINT_CP) $(PLUGIN_INSTALL_DIR)/gui
- $(CP) $(TARGETS_GUI) $(PLUGIN_INSTALL_DIR)/gui
diff --git a/sci-mathematics/frama-c/frama-c-20100401.ebuild b/sci-mathematics/frama-c/frama-c-20100401.ebuild
deleted file mode 100644
index 52ecf12..0000000
--- a/sci-mathematics/frama-c/frama-c-20100401.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="3"
-
-inherit autotools eutils
-
-NAME="Boron"
-
-DESCRIPTION="Suite for analysis of the source code in C"
-HOMEPAGE="http://frama-c.com"
-SRC_URI="http://frama-c.com/download/${PN/-c/-c-$NAME}-${PV/_/-}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="apron doc gtk +ocamlopt +why"
-
-RESTRICT="strip"
-
-DEPEND="
- >=dev-lang/ocaml-3.10.2[ocamlopt?]
- >=dev-ml/ocamlgraph-1.6[gtk?,ocamlopt?]
- sci-mathematics/ltl2ba
- apron? ( sci-mathematics/apron )
- gtk? (
- x11-libs/gtksourceview:2.0
- >=gnome-base/libgnomecanvas-2.26
- >=dev-ml/lablgtk-2.14[sourceview,gnomecanvas,ocamlopt?]
- )"
-RDEPEND="${DEPEND}"
-PDEPEND="why? ( >=sci-mathematics/why-2.26 )"
-
-S="${WORKDIR}/${PN/-c/-c-$NAME}-${PV/_/-}"
-
-src_prepare(){
- rm share/libc/test.c
- rm -Rf src/wp
-
- epatch "${FILESDIR}/${P}-plugin_install.patch"
-
- touch config_file
- eautoreconf
-}
-
-src_configure() {
- if use gtk; then
- myconf="--enable-gui"
- else
- myconf="--disable-gui"
- fi
-
- econf ${myconf} || die "econf failed"
-}
-
-src_compile() {
- # dependencies can not be processed in parallel,
- # this is the intended behavior.
- emake -j1 depend || die "emake depend failed"
- emake all top DESTDIR="/" || die "emake failed"
-}
-
-src_install(){
- emake install DESTDIR="${D}" || die "emake install failed"
- dodoc Changelog doc/README
-
- if use doc; then
- dodoc doc/manuals/*
- fi
-}
diff --git a/sci-mathematics/frama-c/frama-c-20101202_beta2.ebuild b/sci-mathematics/frama-c/frama-c-20110201.ebuild
similarity index 70%
rename from sci-mathematics/frama-c/frama-c-20101202_beta2.ebuild
rename to sci-mathematics/frama-c/frama-c-20110201.ebuild
index 8f89398..2822e90 100644
--- a/sci-mathematics/frama-c/frama-c-20101202_beta2.ebuild
+++ b/sci-mathematics/frama-c/frama-c-20110201.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -6,29 +6,24 @@ EAPI="3"
inherit autotools eutils
-NAME="Carbon"
-
-DESCRIPTION="Suite for analysis of the source code in C"
+DESCRIPTION="Frama-C is a suite of tools dedicated to the analysis of the source code of software written in C."
HOMEPAGE="http://frama-c.com"
+NAME="Carbon"
SRC_URI="http://frama-c.com/download/${PN/-c/-c-$NAME}-${PV/_/-}.tar.gz"
LICENSE="LGPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
IUSE="apron doc gtk +ocamlopt +why"
-
RESTRICT="strip"
-DEPEND="
- >=dev-lang/ocaml-3.10.2[ocamlopt?]
- >=dev-ml/ocamlgraph-1.6[gtk?,ocamlopt?]
- sci-mathematics/ltl2ba
- apron? ( sci-mathematics/apron )
- gtk? (
- x11-libs/gtksourceview:2.0
- >=gnome-base/libgnomecanvas-2.26
- >=dev-ml/lablgtk-2.14[sourceview,gnomecanvas,ocamlopt?]
- )"
+DEPEND=">=dev-lang/ocaml-3.10.2[ocamlopt?]
+ >=dev-ml/ocamlgraph-1.6[gtk?,ocamlopt?]
+ gtk? ( >=x11-libs/gtksourceview-2.8
+ >=gnome-base/libgnomecanvas-2.26
+ >=dev-ml/lablgtk-2.14[sourceview,gnomecanvas,ocamlopt?] )
+ sci-mathematics/ltl2ba
+ apron? ( sci-mathematics/apron )"
RDEPEND="${DEPEND}"
PDEPEND="why? ( >=sci-mathematics/why-2.26 )"
@@ -44,8 +39,6 @@ src_prepare(){
mv doc/manuals doc/pdf
touch config_file
- sed -i configure.in \
- -e "s:1.7):1.6):g"
eautoreconf
}
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] proj/sci:master commit in: sci-mathematics/frama-c/files/, sci-mathematics/frama-c/
@ 2014-02-24 17:56 Andrew Savchenko
0 siblings, 0 replies; 6+ messages in thread
From: Andrew Savchenko @ 2014-02-24 17:56 UTC (permalink / raw
To: gentoo-commits
commit: 6fea4eb8b6cccd829f23b3f377d84e0aceadf8da
Author: Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Mon Feb 24 17:54:35 2014 +0000
Commit: Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Mon Feb 24 17:54:35 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=6fea4eb8
sci-mathematics/frama-c: version bump
Upgrade to EAPI 5.
Fix build with make >= 4.0.
Support build with recent ocaml-4.01.
---
sci-mathematics/frama-c/ChangeLog | 8 +-
sci-mathematics/frama-c/files/frama-c-make.patch | 12 ++
.../frama-c/files/frama-c-ocaml-4.01.patch | 145 +++++++++++++++++++++
sci-mathematics/frama-c/frama-c-20130601.ebuild | 65 +++++++++
4 files changed, 229 insertions(+), 1 deletion(-)
diff --git a/sci-mathematics/frama-c/ChangeLog b/sci-mathematics/frama-c/ChangeLog
index 6ae7f62..6ece894 100644
--- a/sci-mathematics/frama-c/ChangeLog
+++ b/sci-mathematics/frama-c/ChangeLog
@@ -1,7 +1,13 @@
# ChangeLog for sci-mathematics/frama-c
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*frama-c-20130601 (24 Feb 2014)
+
+ 24 Feb 2014; Andrew Savchenko <bircoph@gmail.com> +frama-c-20130601.ebuild,
+ +files/frama-c-ocaml-4.01.patch, +files/frama-c-make.patch:
+ Version bump. Fix build with make >= 4.x, add ocaml-4.01 support.
+
14 Jan 2013; J.-C. Demay <jcdemay@gmail.com>
+frama-c-20120901.ebuild, -frama-c-20111001.ebuild:
version bump
diff --git a/sci-mathematics/frama-c/files/frama-c-make.patch b/sci-mathematics/frama-c/files/frama-c-make.patch
new file mode 100644
index 0000000..7e0b1d9
--- /dev/null
+++ b/sci-mathematics/frama-c/files/frama-c-make.patch
@@ -0,0 +1,12 @@
+--- frama-c-Oxygen-20120901/configure.in.orig 2012-09-19 15:56:17.000000000 +0400
++++ frama-c-Oxygen-20120901/configure.in 2014-02-24 19:02:44.616467203 +0400
+@@ -61,7 +61,8 @@
+ MAKE_MAJOR=`$MAKE -v | sed -n -f bin/sed_get_make_major `
+ MAKE_MINOR=`$MAKE -v | sed -n -f bin/sed_get_make_minor `
+ echo $ECHO_N "make version is $MAKE_DISTRIB Make $MAKE_MAJOR.$MAKE_MINOR: $ECHO_C"
+-if test "$MAKE_DISTRIB" != GNU -o "$MAKE_MAJOR" -lt 3 -o "$MAKE_MINOR" -lt 81;
++if test "$MAKE_DISTRIB" != GNU -o \( "$MAKE_MAJOR" -eq 3 -a "$MAKE_MINOR" -lt 81 \)
++ -o "$MAKE_MAJOR" -lt 3;
+ then
+ echo "${ECHO_T}"
+ AC_MSG_ERROR([unsupported version; GNU Make version 3.81
diff --git a/sci-mathematics/frama-c/files/frama-c-ocaml-4.01.patch b/sci-mathematics/frama-c/files/frama-c-ocaml-4.01.patch
new file mode 100644
index 0000000..44b86b3
--- /dev/null
+++ b/sci-mathematics/frama-c/files/frama-c-ocaml-4.01.patch
@@ -0,0 +1,145 @@
+https://raw.github.com/vprevosto/opam-repository/2e0db18a822eb1818cd39a02e2ca8dde071e5d51/packages/frama-c.20130601/files/4.01-compat.patch
+diff -Naur frama-c-Fluorine-20130601/external/hptmap.ml frama-c-Fluorine-20130601.new/external/hptmap.ml
+--- frama-c-Fluorine-20130601/external/hptmap.ml 2013-06-11 18:15:19.000000000 +0400
++++ frama-c-Fluorine-20130601.new/external/hptmap.ml 2014-02-24 20:17:10.749247061 +0400
+@@ -357,6 +357,21 @@
+ find htr
+
+
++ let find_key key htr =
++ let id = Key.id key in
++ let rec find htr =
++ match htr with
++ | Empty ->
++ raise Not_found
++ | Leaf (key', _, _) ->
++ if Key.equal key key' then
++ key'
++ else
++ raise Not_found
++ | Branch (_, mask, tree0, tree1, _) ->
++ find (if (id land mask) = 0 then tree0 else tree1)
++ in
++ find htr
+
+
+ let mem key htr =
+diff -Naur frama-c-Fluorine-20130601/external/hptmap.mli frama-c-Fluorine-20130601.new/external/hptmap.mli
+--- frama-c-Fluorine-20130601/external/hptmap.mli 2013-06-11 18:15:19.000000000 +0400
++++ frama-c-Fluorine-20130601.new/external/hptmap.mli 2014-02-24 20:17:10.769246098 +0400
+@@ -84,6 +84,9 @@
+ for [k], it is overridden. *)
+
+ val find : key -> t -> V.t
++
++ val find_key: key -> t -> key
++
+ val remove : key -> t -> t
+ (** [remove k m] returns the map [m] deprived from any binding involving
+ [k]. *)
+diff -Naur frama-c-Fluorine-20130601/src/kernel/file.ml frama-c-Fluorine-20130601.new/src/kernel/file.ml
+--- frama-c-Fluorine-20130601/src/kernel/file.ml 2013-06-11 18:13:13.000000000 +0400
++++ frama-c-Fluorine-20130601.new/src/kernel/file.ml 2014-02-24 20:17:10.773245905 +0400
+@@ -322,6 +322,7 @@
+ Printer.pp_logic_var lv Printer.pp_varinfo v
+
+ method vlogic_info_decl li =
++ Logic_var.Hashtbl.add known_logic_info li.l_var_info li;
+ List.iter
+ (fun lv ->
+ if lv.lv_kind <> LVFormal then
+@@ -769,10 +770,6 @@
+ DoChildren
+ | _ -> DoChildren
+
+- method vlogic_info_decl li =
+- Logic_var.Hashtbl.add known_logic_info li.l_var_info li;
+- DoChildren
+-
+ method vlogic_info_use li =
+ let unknown () =
+ check_abort "logic function %s has no information" li.l_var_info.lv_name
+diff -Naur frama-c-Fluorine-20130601/src/lib/hptset.ml frama-c-Fluorine-20130601.new/src/lib/hptset.ml
+--- frama-c-Fluorine-20130601/src/lib/hptset.ml 2013-06-11 18:13:42.000000000 +0400
++++ frama-c-Fluorine-20130601.new/src/lib/hptset.ml 2014-02-24 20:17:10.773245905 +0400
+@@ -26,6 +26,7 @@
+ val empty: t
+ val is_empty: t -> bool
+ val mem: elt -> t -> bool
++ val find: elt -> t -> elt
+ val add: elt -> t -> t
+ val singleton: elt -> t
+ val remove: elt -> t -> t
+@@ -71,6 +72,7 @@
+ type elt = X.t
+
+ let add k = add k ()
++ let find = find_key
+ let iter f = iter (fun x () -> f x)
+ let fold f = fold (fun x () -> f x)
+
+diff -Naur frama-c-Fluorine-20130601/src/lib/hptset.mli frama-c-Fluorine-20130601.new/src/lib/hptset.mli
+--- frama-c-Fluorine-20130601/src/lib/hptset.mli 2013-06-11 18:13:42.000000000 +0400
++++ frama-c-Fluorine-20130601.new/src/lib/hptset.mli 2014-02-24 20:17:10.777245712 +0400
+@@ -50,6 +50,8 @@
+ val mem: elt -> t -> bool
+ (** [mem x s] tests whether [x] belongs to the set [s]. *)
+
++ val find: elt -> t -> elt
++
+ val add: elt -> t -> t
+ (** [add x s] returns a set containing all elements of [s],
+ plus [x]. If [x] was already in [s], [s] is returned unchanged. *)
+diff -Naur frama-c-Fluorine-20130601/src/lib/setWithNearest.ml frama-c-Fluorine-20130601.new/src/lib/setWithNearest.ml
+--- frama-c-Fluorine-20130601/src/lib/setWithNearest.ml 2013-06-11 18:13:42.000000000 +0400
++++ frama-c-Fluorine-20130601.new/src/lib/setWithNearest.ml 2014-02-24 20:17:10.781245519 +0400
+@@ -165,6 +165,14 @@
+ let c = Ord.compare x v in
+ c = 0 || mem x (if c < 0 then l else r)
+
++ let rec find x = function
++ | Empty -> raise Not_found
++ | Node(l, v, r, _) ->
++ match Ord.compare x v with
++ | c when c < 0 -> find x l
++ | 0 -> v
++ | _ -> find x r
++
+ let singleton x = Node(Empty, x, Empty, 1)
+
+ let rec remove x = function
+diff -Naur frama-c-Fluorine-20130601/src/memory_state/cvalue.mli frama-c-Fluorine-20130601.new/src/memory_state/cvalue.mli
+--- frama-c-Fluorine-20130601/src/memory_state/cvalue.mli 2013-06-11 18:13:51.000000000 +0400
++++ frama-c-Fluorine-20130601.new/src/memory_state/cvalue.mli 2014-02-24 20:17:10.781245519 +0400
+@@ -35,8 +35,8 @@
+ include module type of Location_Bytes
+ (* Too many aliases, and OCaml module system is not able to keep track
+ of all of them. Use some shortcuts *)
+- with type z = Location_Bytes.z
+- and type M.t = Location_Bytes.M.t
++ with type M.t = Location_Bytes.M.t
++ and type z = Location_Bytes.z
+
+ include Lattice_With_Isotropy.S
+ with type t := t
+diff -Naur frama-c-Fluorine-20130601/src/wp/qed/src/idxset.ml frama-c-Fluorine-20130601.new/src/wp/qed/src/idxset.ml
+--- frama-c-Fluorine-20130601/src/wp/qed/src/idxset.ml 2013-06-11 18:13:23.000000000 +0400
++++ frama-c-Fluorine-20130601.new/src/wp/qed/src/idxset.ml 2014-02-24 20:17:10.785245326 +0400
+@@ -59,6 +59,8 @@
+
+ let mem e s = mem_k (E.id e) s
+
++ let find e s = if mem e s then e else raise Not_found
++
+ let lowest_bit x = x land (-x)
+
+ let branching_bit p0 p1 = lowest_bit (p0 lxor p1)
+@@ -360,6 +362,8 @@
+
+ let mem e s = mem_k (index e) s
+
++ let find e s = if mem e s then e else raise Not_found
++
+ let mask k m = (k lor (m-1)) land (lnot m)
+
+ (* we first write a naive implementation of [highest_bit]
diff --git a/sci-mathematics/frama-c/frama-c-20130601.ebuild b/sci-mathematics/frama-c/frama-c-20130601.ebuild
new file mode 100644
index 0000000..09cfe96
--- /dev/null
+++ b/sci-mathematics/frama-c/frama-c-20130601.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="5"
+
+inherit autotools eutils
+
+DESCRIPTION="Framework for analysis of source codes written in C"
+HOMEPAGE="http://frama-c.com"
+NAME="Fluorine"
+SRC_URI="http://frama-c.com/download/${PN/-c/-c-$NAME}-${PV/_/-}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc gtk +ocamlopt"
+RESTRICT="strip"
+
+DEPEND=">=dev-lang/ocaml-3.10.2[ocamlopt?]
+ >=dev-ml/ocamlgraph-1.8.2[gtk?,ocamlopt?]
+ dev-ml/zarith
+ sci-mathematics/ltl2ba
+ sci-mathematics/alt-ergo
+ gtk? ( >=x11-libs/gtksourceview-2.8
+ >=gnome-base/libgnomecanvas-2.26
+ >=dev-ml/lablgtk-2.14[sourceview,gnomecanvas,ocamlopt?] )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN/-c/-c-$NAME}-${PV/_/-}"
+
+src_prepare(){
+ rm share/libc/test.c
+ touch config_file
+ epatch "${FILESDIR}/${PN}-make.patch" \
+ "${FILESDIR}/${PN}-ocaml-4.01.patch"
+
+ eautoreconf
+}
+
+src_configure(){
+ if use gtk; then
+ myconf="--enable-gui"
+ else
+ myconf="--disable-gui"
+ fi
+
+ econf ${myconf}
+}
+
+src_compile(){
+ # dependencies can not be processed in parallel,
+ # this is the intended behavior.
+ emake -j1 depend
+ emake all top DESTDIR="/"
+}
+
+src_install(){
+ emake install DESTDIR="${D}"
+ dodoc Changelog doc/README
+
+ if use doc; then
+ dodoc doc/manuals/*.pdf
+ fi
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] proj/sci:master commit in: sci-mathematics/frama-c/files/, sci-mathematics/frama-c/
@ 2011-02-28 10:47 Jonathan-Christofer Demay
0 siblings, 0 replies; 6+ messages in thread
From: Jonathan-Christofer Demay @ 2011-02-28 10:47 UTC (permalink / raw
To: gentoo-commits
commit: 24a500377eef9716b19b909ea5071b5a4c3595dd
Author: Jonathan-Christofer Demay <jcdemay <AT> gmail <DOT> com>
AuthorDate: Mon Feb 28 12:48:49 2011 +0000
Commit: Jonathan-Christofer Demay <jcdemay <AT> gmail <DOT> com>
CommitDate: Mon Feb 28 12:48:49 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=24a50037
sci-mathematics/frama-c: fix install doc
---
.../files/frama-c-20101202_beta2-local_tmps.patch | 125 --------------------
.../frama-c/frama-c-20101202_beta2.ebuild | 11 ++-
2 files changed, 8 insertions(+), 128 deletions(-)
diff --git a/sci-mathematics/frama-c/files/frama-c-20101202_beta2-local_tmps.patch b/sci-mathematics/frama-c/files/frama-c-20101202_beta2-local_tmps.patch
deleted file mode 100644
index bd131a0..0000000
--- a/sci-mathematics/frama-c/files/frama-c-20101202_beta2-local_tmps.patch
+++ /dev/null
@@ -1,125 +0,0 @@
-diff -Naurp frama-c-Carbon-20101202-beta2-orig/cil/src/frontc/cabs2cil.ml frama-c-Carbon-20101202-beta2/cil/src/frontc/cabs2cil.ml
---- frama-c-Carbon-20101202-beta2-orig/cil/src/frontc/cabs2cil.ml 2010-12-17 13:17:07.000000000 +0000
-+++ frama-c-Carbon-20101202-beta2/cil/src/frontc/cabs2cil.ml 2011-02-23 15:20:36.000000000 +0000
-@@ -671,13 +671,11 @@ let newTempVar descr (descrpure:bool) ty
- vi.vdescrpure <- descrpure;
- (* Rename if clash, but do not add to the environment *)
- let vi = alphaConvertVarAndAddToEnv false vi in
-- (*
- (* the temporary is local to the function: the normalization can use it
- wherever it wants.
- *)
- !currentFunctionFDEC.sbody.blocals <-
- vi :: !currentFunctionFDEC.sbody.blocals;
-- *)
- vi
-
- let mkAddrOfAndMark loc ((b, off) as lval) : exp =
-@@ -4715,7 +4713,7 @@ and doExp local_env
- (if uop = A.POSINCR then "++" else "--") in
- let tmp = newTempVar (Some descr) true t in
- ([var tmp],
-- local_var_chunk se' tmp +++
-+ se' +++
- (mkStmtOneInstr ~ghost:local_env.is_ghost
- (Set(var tmp, e', CurrentLoc.get ())),[],[],[]),
- (* the tmp variable should not be investigated for
-@@ -4811,13 +4809,11 @@ and doExp local_env
- if needsTemp then
- let descr = Some (Pretty_utils.sfprintf "%a" dd_lval lv) in
- let tmp = newTempVar descr true lvt in
-- let chunk =
-- i2c
-- (mkStmtOneInstr ~ghost:local_env.is_ghost
-- (Set(lv, new_exp (Lval(var tmp)), loc)),
-- [lv],[lv],var tmp :: r1')
-- in
-- ([],var tmp, local_var_chunk chunk tmp)
-+ ([],var tmp,
-+ i2c
-+ (mkStmtOneInstr ~ghost:local_env.is_ghost
-+ (Set(lv, new_exp (Lval(var tmp)), loc)),
-+ [lv],[lv],var tmp :: r1'))
- else r1',lv, empty
- in
- let (r2,se2, _, _) =
-@@ -4939,17 +4935,14 @@ and doExp local_env
- let tmp =
- newTempVar (Some "<boolean expression>") true intType
- in
-- let condChunk =
-- compileCondExp false ce
-+ finishExp []
-+ (compileCondExp false ce
- (empty +++
- (mkStmtOneInstr ~ghost:local_env.is_ghost
- (Set(var tmp, integer 1,loc)),[],[],[]))
- (empty +++
- (mkStmtOneInstr ~ghost:local_env.is_ghost
-- (Set(var tmp, integer 0,loc)),[],[],[]))
-- in
-- finishExp []
-- (local_var_chunk condChunk tmp)
-+ (Set(var tmp, integer 0,loc)),[],[],[])))
- (new_exp ~loc (Lval (var tmp)))
- intType
- end
-@@ -5046,7 +5039,6 @@ and doExp local_env
- newTempVar
- (Some (Pretty_utils.sfprintf "%a" dd_exp e)) true t
- in
-- let c = local_var_chunk c tmp in
- (* create an instruction to give the e to the temporary *)
- let i = mkStmtOneInstr ~ghost:local_env.is_ghost
- (Set(var tmp, e, loc)) in
-@@ -5145,7 +5137,6 @@ and doExp local_env
- ASet (is_real,lv, r, lvt) -> is_real, lv, r, lvt
- | _ ->
- let v = newTempVar None true resTyp in
-- prechunk:= local_var_chunk !prechunk v;
- false, var v, [], resTyp
- in
- pwhat := (ASet (is_real, destlv, r, destlvtyp));
-@@ -5275,7 +5266,6 @@ and doExp local_env
- (Pretty_utils.pp_list ~sep:", " dd_exp) !pargs
- in
- let tmp = newTempVar (Some descr) false restype'' in
-- prechunk:=local_var_chunk !prechunk tmp;
- (* Remember that this variable has been created for this
- * specific call. We will use this in collapseCallCast. *)
- IH.add callTempVars tmp.vid ();
-@@ -5371,7 +5361,6 @@ and doExp local_env
- let (r1,se1, _, _) =
- doExp local_env asconst e1 (ASet(false, tmp_var, [], tresult))
- in
-- let se1 = local_var_chunk se1 tmp in
- let r3,se3,_,_ =
- finishExp
- ~newWhat:(ASet(false,tmp_var, [], tresult)) r3 se3 e3' t3
-@@ -5388,7 +5377,7 @@ and doExp local_env
- | ASet (is_real, lv, r, lvt) -> is_real, lv, r, lvt, empty
- | _ ->
- let tmp = newTempVar None true tresult in
-- false, var tmp, [], tresult, local_var_chunk empty tmp
-+ false, var tmp, [], tresult, empty
- in
- (* Now do e2 and e3 for real *)
- let (r2,se2, _, _) =
-@@ -5461,7 +5450,7 @@ and doExp local_env
- b.bstmts @
- [Cil.mkStmtOneInstr ~ghost:local_env.is_ghost
- (Set (Cil.var vi, e,loc))];
-- (local_var_chunk se vi,Cil.new_exp ~loc (Lval (Cil.var vi)))
-+ (se,Cil.new_exp ~loc (Lval (Cil.var vi)))
- | _ -> se,e
- in
- finishExp [] se e t
-@@ -6583,7 +6572,7 @@ and createLocal ghost ((_, sto, _, _) as
- (Some (Pretty_utils.sfprintf "alloca(%a)" d_exp sizeof))
- false rt
- in
-- (local_var_chunk setlen tmp)
-+ setlen
- +++ (mkStmtOneInstr ~ghost
- (Call(Some(var tmp), new_exp ~loc (Lval(var alloca)),
- [ sizeof ], CurrentLoc.get ())),[],[],[])
diff --git a/sci-mathematics/frama-c/frama-c-20101202_beta2.ebuild b/sci-mathematics/frama-c/frama-c-20101202_beta2.ebuild
index 1bf1977..170ddf2 100644
--- a/sci-mathematics/frama-c/frama-c-20101202_beta2.ebuild
+++ b/sci-mathematics/frama-c/frama-c-20101202_beta2.ebuild
@@ -33,8 +33,11 @@ src_prepare(){
rm share/libc/test.c
rm -Rf src/wp
- epatch "${FILESDIR}/${P}-local_tmps.patch"
-
+ mkdir cil/pdf
+ mv cil/doc/*.pdf cil/doc/*.tex cil/pdf
+ mv cil/doc cil/html
+ mv doc/manuals doc/pdf
+
touch config_file
sed -i configure.in \
-e "s:1.7):1.6):g"
@@ -63,6 +66,8 @@ src_install(){
dodoc Changelog doc/README
if use doc; then
- dodoc doc/manuals/*
+ dodoc doc/pdf/*.pdf
+ dodoc cil/pdf/*.pdf
+ dohtml -r cil/html/*
fi
}
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] proj/sci:master commit in: sci-mathematics/frama-c/files/, sci-mathematics/frama-c/
@ 2011-02-23 14:17 Jonathan-Christofer Demay
0 siblings, 0 replies; 6+ messages in thread
From: Jonathan-Christofer Demay @ 2011-02-23 14:17 UTC (permalink / raw
To: gentoo-commits
commit: 533ac92a825257fd5995738ccab5683abc85e52e
Author: Jonathan-Christofer Demay <jcdemay <AT> gmail <DOT> com>
AuthorDate: Wed Feb 23 16:19:06 2011 +0000
Commit: Jonathan-Christofer Demay <jcdemay <AT> gmail <DOT> com>
CommitDate: Wed Feb 23 16:19:06 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=533ac92a
sci-mathematics/frama-c: temporary retro-compatibility patch
---
.../files/frama-c-20101202_beta2-local_tmps.patch | 125 ++++++++++++++++++++
.../frama-c/frama-c-20101202_beta2.ebuild | 2 +
2 files changed, 127 insertions(+), 0 deletions(-)
diff --git a/sci-mathematics/frama-c/files/frama-c-20101202_beta2-local_tmps.patch b/sci-mathematics/frama-c/files/frama-c-20101202_beta2-local_tmps.patch
new file mode 100644
index 0000000..bd131a0
--- /dev/null
+++ b/sci-mathematics/frama-c/files/frama-c-20101202_beta2-local_tmps.patch
@@ -0,0 +1,125 @@
+diff -Naurp frama-c-Carbon-20101202-beta2-orig/cil/src/frontc/cabs2cil.ml frama-c-Carbon-20101202-beta2/cil/src/frontc/cabs2cil.ml
+--- frama-c-Carbon-20101202-beta2-orig/cil/src/frontc/cabs2cil.ml 2010-12-17 13:17:07.000000000 +0000
++++ frama-c-Carbon-20101202-beta2/cil/src/frontc/cabs2cil.ml 2011-02-23 15:20:36.000000000 +0000
+@@ -671,13 +671,11 @@ let newTempVar descr (descrpure:bool) ty
+ vi.vdescrpure <- descrpure;
+ (* Rename if clash, but do not add to the environment *)
+ let vi = alphaConvertVarAndAddToEnv false vi in
+- (*
+ (* the temporary is local to the function: the normalization can use it
+ wherever it wants.
+ *)
+ !currentFunctionFDEC.sbody.blocals <-
+ vi :: !currentFunctionFDEC.sbody.blocals;
+- *)
+ vi
+
+ let mkAddrOfAndMark loc ((b, off) as lval) : exp =
+@@ -4715,7 +4713,7 @@ and doExp local_env
+ (if uop = A.POSINCR then "++" else "--") in
+ let tmp = newTempVar (Some descr) true t in
+ ([var tmp],
+- local_var_chunk se' tmp +++
++ se' +++
+ (mkStmtOneInstr ~ghost:local_env.is_ghost
+ (Set(var tmp, e', CurrentLoc.get ())),[],[],[]),
+ (* the tmp variable should not be investigated for
+@@ -4811,13 +4809,11 @@ and doExp local_env
+ if needsTemp then
+ let descr = Some (Pretty_utils.sfprintf "%a" dd_lval lv) in
+ let tmp = newTempVar descr true lvt in
+- let chunk =
+- i2c
+- (mkStmtOneInstr ~ghost:local_env.is_ghost
+- (Set(lv, new_exp (Lval(var tmp)), loc)),
+- [lv],[lv],var tmp :: r1')
+- in
+- ([],var tmp, local_var_chunk chunk tmp)
++ ([],var tmp,
++ i2c
++ (mkStmtOneInstr ~ghost:local_env.is_ghost
++ (Set(lv, new_exp (Lval(var tmp)), loc)),
++ [lv],[lv],var tmp :: r1'))
+ else r1',lv, empty
+ in
+ let (r2,se2, _, _) =
+@@ -4939,17 +4935,14 @@ and doExp local_env
+ let tmp =
+ newTempVar (Some "<boolean expression>") true intType
+ in
+- let condChunk =
+- compileCondExp false ce
++ finishExp []
++ (compileCondExp false ce
+ (empty +++
+ (mkStmtOneInstr ~ghost:local_env.is_ghost
+ (Set(var tmp, integer 1,loc)),[],[],[]))
+ (empty +++
+ (mkStmtOneInstr ~ghost:local_env.is_ghost
+- (Set(var tmp, integer 0,loc)),[],[],[]))
+- in
+- finishExp []
+- (local_var_chunk condChunk tmp)
++ (Set(var tmp, integer 0,loc)),[],[],[])))
+ (new_exp ~loc (Lval (var tmp)))
+ intType
+ end
+@@ -5046,7 +5039,6 @@ and doExp local_env
+ newTempVar
+ (Some (Pretty_utils.sfprintf "%a" dd_exp e)) true t
+ in
+- let c = local_var_chunk c tmp in
+ (* create an instruction to give the e to the temporary *)
+ let i = mkStmtOneInstr ~ghost:local_env.is_ghost
+ (Set(var tmp, e, loc)) in
+@@ -5145,7 +5137,6 @@ and doExp local_env
+ ASet (is_real,lv, r, lvt) -> is_real, lv, r, lvt
+ | _ ->
+ let v = newTempVar None true resTyp in
+- prechunk:= local_var_chunk !prechunk v;
+ false, var v, [], resTyp
+ in
+ pwhat := (ASet (is_real, destlv, r, destlvtyp));
+@@ -5275,7 +5266,6 @@ and doExp local_env
+ (Pretty_utils.pp_list ~sep:", " dd_exp) !pargs
+ in
+ let tmp = newTempVar (Some descr) false restype'' in
+- prechunk:=local_var_chunk !prechunk tmp;
+ (* Remember that this variable has been created for this
+ * specific call. We will use this in collapseCallCast. *)
+ IH.add callTempVars tmp.vid ();
+@@ -5371,7 +5361,6 @@ and doExp local_env
+ let (r1,se1, _, _) =
+ doExp local_env asconst e1 (ASet(false, tmp_var, [], tresult))
+ in
+- let se1 = local_var_chunk se1 tmp in
+ let r3,se3,_,_ =
+ finishExp
+ ~newWhat:(ASet(false,tmp_var, [], tresult)) r3 se3 e3' t3
+@@ -5388,7 +5377,7 @@ and doExp local_env
+ | ASet (is_real, lv, r, lvt) -> is_real, lv, r, lvt, empty
+ | _ ->
+ let tmp = newTempVar None true tresult in
+- false, var tmp, [], tresult, local_var_chunk empty tmp
++ false, var tmp, [], tresult, empty
+ in
+ (* Now do e2 and e3 for real *)
+ let (r2,se2, _, _) =
+@@ -5461,7 +5450,7 @@ and doExp local_env
+ b.bstmts @
+ [Cil.mkStmtOneInstr ~ghost:local_env.is_ghost
+ (Set (Cil.var vi, e,loc))];
+- (local_var_chunk se vi,Cil.new_exp ~loc (Lval (Cil.var vi)))
++ (se,Cil.new_exp ~loc (Lval (Cil.var vi)))
+ | _ -> se,e
+ in
+ finishExp [] se e t
+@@ -6583,7 +6572,7 @@ and createLocal ghost ((_, sto, _, _) as
+ (Some (Pretty_utils.sfprintf "alloca(%a)" d_exp sizeof))
+ false rt
+ in
+- (local_var_chunk setlen tmp)
++ setlen
+ +++ (mkStmtOneInstr ~ghost
+ (Call(Some(var tmp), new_exp ~loc (Lval(var alloca)),
+ [ sizeof ], CurrentLoc.get ())),[],[],[])
diff --git a/sci-mathematics/frama-c/frama-c-20101202_beta2.ebuild b/sci-mathematics/frama-c/frama-c-20101202_beta2.ebuild
index 05e24cf..1bf1977 100644
--- a/sci-mathematics/frama-c/frama-c-20101202_beta2.ebuild
+++ b/sci-mathematics/frama-c/frama-c-20101202_beta2.ebuild
@@ -32,6 +32,8 @@ S="${WORKDIR}/${PN/-c/-c-$NAME}-${PV/_/-}"
src_prepare(){
rm share/libc/test.c
rm -Rf src/wp
+
+ epatch "${FILESDIR}/${P}-local_tmps.patch"
touch config_file
sed -i configure.in \
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] proj/sci:master commit in: sci-mathematics/frama-c/files/, sci-mathematics/frama-c/
@ 2011-02-23 13:23 Jonathan-Christofer Demay
0 siblings, 0 replies; 6+ messages in thread
From: Jonathan-Christofer Demay @ 2011-02-23 13:23 UTC (permalink / raw
To: gentoo-commits
commit: d840f6713bf450abce0020ad94756314ae8d1120
Author: Jonathan-Christofer Demay <jcdemay <AT> gmail <DOT> com>
AuthorDate: Wed Feb 23 15:25:32 2011 +0000
Commit: Jonathan-Christofer Demay <jcdemay <AT> gmail <DOT> com>
CommitDate: Wed Feb 23 15:25:32 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=d840f671
sci-mathematics/frama-c: keep previous version for now
---
.../files/frama-c-20100401-plugin_install.patch | 33 ++++++++++
sci-mathematics/frama-c/frama-c-20100401.ebuild | 66 ++++++++++++++++++++
2 files changed, 99 insertions(+), 0 deletions(-)
diff --git a/sci-mathematics/frama-c/files/frama-c-20100401-plugin_install.patch b/sci-mathematics/frama-c/files/frama-c-20100401-plugin_install.patch
new file mode 100644
index 0000000..c5463cc
--- /dev/null
+++ b/sci-mathematics/frama-c/files/frama-c-20100401-plugin_install.patch
@@ -0,0 +1,33 @@
+diff -Naurp frama-c-Boron-20100401/share/Makefile.dynamic frama-c-Boron-20100401b/share/Makefile.dynamic
+--- frama-c-Boron-20100401/share/Makefile.dynamic 2010-04-13 11:52:53.000000000 +0000
++++ frama-c-Boron-20100401/share/Makefile.dynamic 2010-07-04 19:48:52.000000000 +0000
+@@ -113,7 +113,7 @@ endif #FRAMAC_MAKE
+
+ PLUGIN_LIB_DIR ?= $(PLUGIN_DIR)
+ PLUGIN_GUI_LIB_DIR ?= $(PLUGIN_DIR)/gui
+-PLUGIN_INSTALL_DIR ?=$(FRAMAC_PLUGINDIR)
++PLUGIN_INSTALL_DIR ?=$(DESTDIR)$(FRAMAC_PLUGINDIR)
+
+ PLUGIN_FLAGS:=$(FLAGS) $(DEBUG) $(FRAMAC_INCLUDES) -I $(FRAMAC_LIBDIR)
+ PLUGIN_BFLAGS:=$(PLUGIN_FLAGS) $(PLUGIN_BFLAGS)
+@@ -182,6 +182,7 @@ endif
+ ifneq ($(PLUGIN_ENABLE),no)
+ install::
+ $(PRINT_CP) $(PLUGIN_INSTALL_DIR)
++ $(MKDIR) $(PLUGIN_INSTALL_DIR)
+ $(CP) $(TARGETS) $(PLUGIN_INSTALL_DIR)
+ $(PRINT_CP) $(BINDIR)
+ if [ -f frama-c-$(PLUGIN_NAME).byte$(EXE) ]; then \
+@@ -191,9 +192,9 @@ install::
+ $(CP) frama-c-$(PLUGIN_NAME).$(OCAMLBEST)$(EXE) \
+ $(BINDIR)/frama-c-$(PLUGIN_NAME)$(EXE); \
+ fi
+- $(PRINT_UPDATE) $(FRAMAC_SHARE)/known_plugins.ac
+- echo "ENABLE_`echo $(PLUGIN_NAME) | tr "a-z" "A-Z"`=$(PLUGIN_ENABLE)" \
+- >> $(FRAMAC_SHARE)/known_plugins.ac
++ #$(PRINT_UPDATE) $(FRAMAC_SHARE)/known_plugins.ac
++ #echo "ENABLE_`echo $(PLUGIN_NAME) | tr "a-z" "A-Z"`=$(PLUGIN_ENABLE)" \
++ # >> $(FRAMAC_SHARE)/known_plugins.ac
+ ifeq ($(HAS_GUI),yes)
+ $(PRINT_CP) $(PLUGIN_INSTALL_DIR)/gui
+ $(CP) $(TARGETS_GUI) $(PLUGIN_INSTALL_DIR)/gui
diff --git a/sci-mathematics/frama-c/frama-c-20100401.ebuild b/sci-mathematics/frama-c/frama-c-20100401.ebuild
new file mode 100644
index 0000000..ffcf9b0
--- /dev/null
+++ b/sci-mathematics/frama-c/frama-c-20100401.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="3"
+
+inherit autotools eutils
+
+DESCRIPTION="Frama-C is a suite of tools dedicated to the analysis of the source code of software written in C."
+HOMEPAGE="http://frama-c.com"
+NAME="Boron"
+SRC_URI="http://frama-c.com/download/${PN/-c/-c-$NAME}-${PV/_/-}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="apron doc gtk +ocamlopt +why"
+RESTRICT="strip"
+
+DEPEND=">=dev-lang/ocaml-3.10.2[ocamlopt?]
+ >=dev-ml/ocamlgraph-1.6[gtk?,ocamlopt?]
+ gtk? ( >=x11-libs/gtksourceview-2.8
+ >=gnome-base/libgnomecanvas-2.26
+ >=dev-ml/lablgtk-2.14[sourceview,gnomecanvas,ocamlopt?] )
+ sci-mathematics/ltl2ba
+ apron? ( sci-mathematics/apron )"
+RDEPEND="${DEPEND}"
+PDEPEND="why? ( >=sci-mathematics/why-2.26 )"
+
+S="${WORKDIR}/${PN/-c/-c-$NAME}-${PV/_/-}"
+
+src_prepare(){
+ rm share/libc/test.c
+ rm -Rf src/wp
+
+ epatch "${FILESDIR}/${P}-plugin_install.patch"
+
+ touch config_file
+ eautoreconf
+}
+
+src_configure() {
+ if use gtk; then
+ myconf="--enable-gui"
+ else
+ myconf="--disable-gui"
+ fi
+
+ econf ${myconf} || die "econf failed"
+}
+
+src_compile() {
+ # dependencies can not be processed in parallel,
+ # this is the intended behavior.
+ emake -j1 depend || die "emake depend failed"
+ emake all top DESTDIR="/" || die "emake failed"
+}
+
+src_install(){
+ emake install DESTDIR="${D}" || die "emake install failed"
+ dodoc Changelog doc/README
+
+ if use doc; then
+ dodoc doc/manuals/*
+ fi
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] proj/sci:master commit in: sci-mathematics/frama-c/files/, sci-mathematics/frama-c/
@ 2011-02-14 0:33 Jonathan-Christofer Demay
0 siblings, 0 replies; 6+ messages in thread
From: Jonathan-Christofer Demay @ 2011-02-14 0:33 UTC (permalink / raw
To: gentoo-commits
commit: 65a9a83e4f56155ad43c1c5bddff54a970ffd437
Author: Jonathan-Christofer Demay <jcdemay <AT> gmail <DOT> com>
AuthorDate: Mon Feb 14 02:36:10 2011 +0000
Commit: Jonathan-Christofer Demay <jcdemay <AT> gmail <DOT> com>
CommitDate: Mon Feb 14 02:36:10 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=65a9a83e
sci-mathematics/frama-c: version bump
---
sci-mathematics/frama-c/ChangeLog | 8 +++-
.../files/frama-c-20100401-plugin_install.patch | 33 --------------------
...a-c-20100401.ebuild => frama-c-20110201.ebuild} | 10 +++---
3 files changed, 11 insertions(+), 40 deletions(-)
diff --git a/sci-mathematics/frama-c/ChangeLog b/sci-mathematics/frama-c/ChangeLog
index 89dc599..4e7e9d7 100644
--- a/sci-mathematics/frama-c/ChangeLog
+++ b/sci-mathematics/frama-c/ChangeLog
@@ -1,14 +1,18 @@
# ChangeLog for sci-mathematics/frama-c
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 14 Feb 2011; J.-C. Demay <jcdemay@gmail.com>
+ +frama-c-20110201.ebuild, -frama-c-20100401.ebuild, -files/frama-c-20100401-plugin_install.patch:
+ version bump
+
11 Jul 2010; Andreas K. Huettel (dilfridge) <mail@akhuettel.de>
frama-c-20100401.ebuild:
Dropped ~sparc since dependencies cannot be fulfilled.
08 Jul 2010; J.-C. Demay <jcdemay@gmail.com>
frama-c-20100401.ebuild:
- Version bump
+ version bump
22 Jun 2010; Andreas K. Huettel (dilfridge) <mail@akhuettel.de>
frama-c-20090901.ebuild, +metadata.xml:
diff --git a/sci-mathematics/frama-c/files/frama-c-20100401-plugin_install.patch b/sci-mathematics/frama-c/files/frama-c-20100401-plugin_install.patch
deleted file mode 100644
index c5463cc..0000000
--- a/sci-mathematics/frama-c/files/frama-c-20100401-plugin_install.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -Naurp frama-c-Boron-20100401/share/Makefile.dynamic frama-c-Boron-20100401b/share/Makefile.dynamic
---- frama-c-Boron-20100401/share/Makefile.dynamic 2010-04-13 11:52:53.000000000 +0000
-+++ frama-c-Boron-20100401/share/Makefile.dynamic 2010-07-04 19:48:52.000000000 +0000
-@@ -113,7 +113,7 @@ endif #FRAMAC_MAKE
-
- PLUGIN_LIB_DIR ?= $(PLUGIN_DIR)
- PLUGIN_GUI_LIB_DIR ?= $(PLUGIN_DIR)/gui
--PLUGIN_INSTALL_DIR ?=$(FRAMAC_PLUGINDIR)
-+PLUGIN_INSTALL_DIR ?=$(DESTDIR)$(FRAMAC_PLUGINDIR)
-
- PLUGIN_FLAGS:=$(FLAGS) $(DEBUG) $(FRAMAC_INCLUDES) -I $(FRAMAC_LIBDIR)
- PLUGIN_BFLAGS:=$(PLUGIN_FLAGS) $(PLUGIN_BFLAGS)
-@@ -182,6 +182,7 @@ endif
- ifneq ($(PLUGIN_ENABLE),no)
- install::
- $(PRINT_CP) $(PLUGIN_INSTALL_DIR)
-+ $(MKDIR) $(PLUGIN_INSTALL_DIR)
- $(CP) $(TARGETS) $(PLUGIN_INSTALL_DIR)
- $(PRINT_CP) $(BINDIR)
- if [ -f frama-c-$(PLUGIN_NAME).byte$(EXE) ]; then \
-@@ -191,9 +192,9 @@ install::
- $(CP) frama-c-$(PLUGIN_NAME).$(OCAMLBEST)$(EXE) \
- $(BINDIR)/frama-c-$(PLUGIN_NAME)$(EXE); \
- fi
-- $(PRINT_UPDATE) $(FRAMAC_SHARE)/known_plugins.ac
-- echo "ENABLE_`echo $(PLUGIN_NAME) | tr "a-z" "A-Z"`=$(PLUGIN_ENABLE)" \
-- >> $(FRAMAC_SHARE)/known_plugins.ac
-+ #$(PRINT_UPDATE) $(FRAMAC_SHARE)/known_plugins.ac
-+ #echo "ENABLE_`echo $(PLUGIN_NAME) | tr "a-z" "A-Z"`=$(PLUGIN_ENABLE)" \
-+ # >> $(FRAMAC_SHARE)/known_plugins.ac
- ifeq ($(HAS_GUI),yes)
- $(PRINT_CP) $(PLUGIN_INSTALL_DIR)/gui
- $(CP) $(TARGETS_GUI) $(PLUGIN_INSTALL_DIR)/gui
diff --git a/sci-mathematics/frama-c/frama-c-20100401.ebuild b/sci-mathematics/frama-c/frama-c-20110201.ebuild
similarity index 87%
rename from sci-mathematics/frama-c/frama-c-20100401.ebuild
rename to sci-mathematics/frama-c/frama-c-20110201.ebuild
index a7b59ec..b23e53e 100644
--- a/sci-mathematics/frama-c/frama-c-20100401.ebuild
+++ b/sci-mathematics/frama-c/frama-c-20110201.ebuild
@@ -7,9 +7,9 @@ EAPI="3"
inherit autotools eutils
DESCRIPTION="Frama-C is a suite of tools dedicated to the analysis of the source code of software written in C."
-HOMEPAGE="http://www.frama-c.cea.fr/"
-NAME="Boron"
-SRC_URI="http://www.frama-c.com/download/${PN/-c/-c-$NAME}-${PV/_/-}.tar.gz"
+HOMEPAGE="http://frama-c.com"
+NAME="Carbon"
+SRC_URI="http://frama-c.com/download/${PN/-c/-c-$NAME}-${PV/_/-}.tar.gz"
LICENSE="LGPL-2"
SLOT="0"
@@ -30,13 +30,13 @@ PDEPEND="why? ( >=sci-mathematics/why-2.26 )"
S="${WORKDIR}/${PN/-c/-c-$NAME}-${PV/_/-}"
src_prepare(){
- epatch "${FILESDIR}/${P}-plugin_install.patch"
+ #epatch "${FILESDIR}/${P}-plugin_install.patch"
rm share/libc/test.c
touch config_file
sed -i configure.in \
- -e "s:1.4):1.5):g"
+ -e "s:1.7):1.6):g"
eautoreconf
}
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2014-02-24 17:56 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-05-11 23:50 [gentoo-commits] proj/sci:master commit in: sci-mathematics/frama-c/files/, sci-mathematics/frama-c/ Jonathan-Christofer Demay
-- strict thread matches above, loose matches on Subject: below --
2014-02-24 17:56 Andrew Savchenko
2011-02-28 10:47 Jonathan-Christofer Demay
2011-02-23 14:17 Jonathan-Christofer Demay
2011-02-23 13:23 Jonathan-Christofer Demay
2011-02-14 0:33 Jonathan-Christofer Demay
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox