Author: rjones
Update of /cvs/pkgs/rpms/ocaml-cil/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5527
Modified Files:
.cvsignore ocaml-cil.spec sources
Added Files:
cil-1.3.7-output-obj.patch
Removed Files:
cil-1.3.6-output-obj.patch
Log Message:
- New upstream version 1.3.7.
- Rebuild for OCaml 3.11.1.
cil-1.3.7-output-obj.patch:
--- NEW FILE cil-1.3.7-output-obj.patch ---
diff -ur cil-1.3.7.orig/Makefile.in cil-1.3.7/Makefile.in
--- cil-1.3.7.orig/Makefile.in 2009-04-24 19:50:33.000000000 +0100
+++ cil-1.3.7/Makefile.in 2009-05-26 15:46:02.932947721 +0100
@@ -287,7 +287,9 @@
ifeq ($(NATIVECAML),1)
$(OBJDIR)/libcil.o: $(OCAML_CIL_LIB_CMODULES:%=$(OBJDIR)/lib%.a) \
$(OCAML_CIL_LIB_MODULES:%=$(OBJDIR)/%.$(CMO))
- ocamlopt -output-obj -o $@ $(CILLY_LIBS:%=%.cmxa) $^
+ ocamlopt -output-obj -o tmpcil.o $(CILLY_LIBS:%=%.cmxa) $^
+ ar rcs $@ tmpcil.o
+ rm -f tmpcil.o
else
$(OBJDIR)/libcil.o:
@echo "Can only build $@ when NATIVECAML is 1."
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-cil/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore 1 Mar 2008 12:31:25 -0000 1.2
+++ .cvsignore 26 May 2009 14:50:04 -0000 1.3
@@ -1 +1 @@
-cil-1.3.6.tar.gz
+cil-1.3.7.tar.gz
Index: ocaml-cil.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-cil/devel/ocaml-cil.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- ocaml-cil.spec 16 Apr 2009 09:06:03 -0000 1.9
+++ ocaml-cil.spec 26 May 2009 14:50:04 -0000 1.10
@@ -5,21 +5,21 @@
%define __strip /bin/true
Name: ocaml-cil
-Version: 1.3.6
-Release: 11%{?dist}
+Version: 1.3.7
+Release: 1%{?dist}
Summary: CIL - Infrastructure for C Program Analysis and Transformation
Group: Development/Libraries
License: BSD
URL: http://cil.sourceforge.net/
-Source0: http://hal.cs.berkeley.edu/cil/distrib/cil-1.3.6.tar.gz
+Source0: http://hal.cs.berkeley.edu/cil/distrib/cil-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
ExcludeArch: ppc64
ExcludeArch: ppc
ExcludeArch: sparc64
ExcludeArch: s390 s390x
-Patch0: cil-1.3.6-output-obj.patch
+Patch0: cil-1.3.7-output-obj.patch
BuildRequires: ocaml, ocaml-findlib-devel, ocaml-ocamldoc
@@ -90,7 +90,7 @@ for gcc.
%prep
-%setup -q -n cil
+%setup -q -n cil-%{version}
%patch0 -p1
./configure --libdir=%{_libdir}
@@ -117,7 +117,7 @@ cat > bin/CilConfig.pm <<EOF
\$::default_mode = "GNUCC";
EOF
-strip obj/$archos/libcil.a
+strip obj/$archos/libcil.o
#strip obj/$archos/cilly.byte.exe - NO! It removes the bytecode :-(
%if %opt
strip obj/$archos/cilly.asm.exe
@@ -195,6 +195,10 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue May 26 2009 Richard W.M. Jones <rjones@xxxxxxxxxx> - 1.3.7-1
+- New upstream version 1.3.7.
+- Rebuild for OCaml 3.11.1.
+
* Thu Apr 16 2009 S390x secondary arch maintainer <fedora-s390x@xxxxxxxxxxxxxxxxxxxxxxx>
- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
(added sparc64 per request from the sparc maintainer)
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-cil/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources 1 Mar 2008 12:31:25 -0000 1.2
+++ sources 26 May 2009 14:50:04 -0000 1.3
@@ -1 +1 @@
-112dfbabdd0e1280800d62ba4449ab45 cil-1.3.6.tar.gz
+e0e3ce3b04c0d9cccf98381feb6d89de cil-1.3.7.tar.gz
--- cil-1.3.6-output-obj.patch DELETED ---
_______________________________________________
Fedora-ocaml-list mailing list
Fedora-ocaml-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/fedora-ocaml-list
