From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Pu0de-000703-DQ for garchives@archives.gentoo.org; Mon, 28 Feb 2011 10:47:38 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 495841C002; Mon, 28 Feb 2011 10:47:30 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id D92251C002 for ; Mon, 28 Feb 2011 10:47:29 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id F0E9A1B406B for ; Mon, 28 Feb 2011 10:47:28 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 325AC8006A for ; Mon, 28 Feb 2011 10:47:28 +0000 (UTC) From: "Jonathan-Christofer Demay" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jonathan-Christofer Demay" Message-ID: <24a500377eef9716b19b909ea5071b5a4c3595dd.jcdemay@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-mathematics/frama-c/files/, sci-mathematics/frama-c/ X-VCS-Repository: proj/sci X-VCS-Files: sci-mathematics/frama-c/files/frama-c-20101202_beta2-local_tmps.patch sci-mathematics/frama-c/frama-c-20101202_beta2.ebuild X-VCS-Directories: sci-mathematics/frama-c/files/ sci-mathematics/frama-c/ X-VCS-Committer: jcdemay X-VCS-Committer-Name: Jonathan-Christofer Demay X-VCS-Revision: 24a500377eef9716b19b909ea5071b5a4c3595dd Date: Mon, 28 Feb 2011 10:47:28 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 2c800000019a6be54c9dabb045825238 commit: 24a500377eef9716b19b909ea5071b5a4c3595dd Author: Jonathan-Christofer Demay gmail com> AuthorDate: Mon Feb 28 12:48:49 2011 +0000 Commit: Jonathan-Christofer Demay gmail com> CommitDate: Mon Feb 28 12:48:49 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/sci.git;a=3Dc= ommit;h=3D24a50037 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_t= mps.patch b/sci-mathematics/frama-c/files/frama-c-20101202_beta2-local_tm= ps.patch deleted file mode 100644 index bd131a0..0000000 --- a/sci-mathematics/frama-c/files/frama-c-20101202_beta2-local_tmps.pat= ch +++ /dev/null @@ -1,125 +0,0 @@ -diff -Naurp frama-c-Carbon-20101202-beta2-orig/cil/src/frontc/cabs2cil.m= l frama-c-Carbon-20101202-beta2/cil/src/frontc/cabs2cil.ml ---- frama-c-Carbon-20101202-beta2-orig/cil/src/frontc/cabs2cil.ml 2010-1= 2-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 =3D 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 -=20 - let mkAddrOfAndMark loc ((b, off) as lval) : exp =3D -@@ -4715,7 +4713,7 @@ and doExp local_env - (if uop =3D A.POSINCR then "++" else "--") in - let tmp =3D 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 =3D Some (Pretty_utils.sfprintf "%a" dd_lval = lv) in - let tmp =3D newTempVar descr true lvt in -- let chunk =3D -- 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, _, _) =3D -@@ -4939,17 +4935,14 @@ and doExp local_env - let tmp =3D - newTempVar (Some "") true intType - in -- let condChunk =3D -- 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 =3D local_var_chunk c tmp in - (* create an instruction to give the e to the temporary *) - let i =3D 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 =3D newTempVar None true resTyp in -- prechunk:=3D local_var_chunk !prechunk v; - false, var v, [], resTyp - in - pwhat :=3D (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 =3D newTempVar (Some descr) false restype'' in -- prechunk:=3Dlocal_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, _, _) =3D - doExp local_env asconst e1 (ASet(false, tmp_var, [], = tresult)) - in -- let se1 =3D local_var_chunk se1 tmp in - let r3,se3,_,_ =3D - 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 =3D newTempVar None true tresult in -- false, var tmp, [], tresult, local_var_chunk empt= y tmp -+ false, var tmp, [], tresult, empty - in - (* Now do e2 and e3 for real *) - let (r2,se2, _, _) =3D -@@ -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.va= r 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 =20 - epatch "${FILESDIR}/${P}-local_tmps.patch" -=09 + 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 =20 if use doc; then - dodoc doc/manuals/* + dodoc doc/pdf/*.pdf + dodoc cil/pdf/*.pdf + dohtml -r cil/html/* fi }