[ocaml-cil] - Patch: Remove '-lstr' option. - Move configure into %%build section.

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



commit 580a710b997cf45cb655f2de04bee0a3c882b0a0
Author: Richard W.M. Jones <rjones@xxxxxxxxxx>
Date:   Fri Jan 7 15:27:28 2011 +0000

    - Patch: Remove '-lstr' option.
    - Move configure into %%build section.

 cil-1.3.7-no-link-to-clib.patch |   10 ++++++++++
 ocaml-cil.spec                  |   10 +++++++---
 2 files changed, 17 insertions(+), 3 deletions(-)
---
diff --git a/cil-1.3.7-no-link-to-clib.patch b/cil-1.3.7-no-link-to-clib.patch
new file mode 100644
index 0000000..95ff982
--- /dev/null
+++ b/cil-1.3.7-no-link-to-clib.patch
@@ -0,0 +1,10 @@
+--- cil-1.3.7/Makefile.in.old	2011-01-07 15:25:13.579993796 +0000
++++ cil-1.3.7/Makefile.in	2011-01-07 15:25:16.430211605 +0000
+@@ -121,7 +121,6 @@
+ 	@$(NARRATIVE) "Linking $(COMPILETOWHAT) $@ $(LINKMSG)"
+ 	$(AT)$(CAMLLINK) -verbose -o $@ \
+                     $(CILLY_LIBS:%=%.$(CMXA)) \
+-                    $(CILLY_LIBS:%=-cclib -l%) \
+                     $^
+ 
+ 
diff --git a/ocaml-cil.spec b/ocaml-cil.spec
index cfecd74..c632ca9 100644
--- a/ocaml-cil.spec
+++ b/ocaml-cil.spec
@@ -6,7 +6,7 @@
 
 Name:           ocaml-cil
 Version:        1.3.7
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        CIL - Infrastructure for C Program Analysis and Transformation
 
 Group:          Development/Libraries
@@ -20,6 +20,7 @@ ExcludeArch:    sparc64
 ExcludeArch:    s390 s390x
 
 Patch0:         cil-1.3.7-output-obj.patch
+Patch1:         cil-1.3.7-no-link-to-clib.patch
 
 BuildRequires:  ocaml, ocaml-findlib-devel, ocaml-ocamldoc
 
@@ -92,10 +93,11 @@ for gcc.
 %prep
 %setup -q -n cil-%{version}
 %patch0 -p1
-./configure --libdir=%{_libdir}
+%patch1 -p1
 
 
 %build
+./configure --libdir=%{_libdir}
 make RELEASE=1
 make quicktest
 
@@ -196,8 +198,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Fri Jan 07 2011 Richard W.M. Jones <rjones@xxxxxxxxxx> - 1.3.7-7
+* Fri Jan 07 2011 Richard W.M. Jones <rjones@xxxxxxxxxx> - 1.3.7-8
 - Rebuild for OCaml 3.12 (http://fedoraproject.org/wiki/Features/OCaml3.12).
+- Patch: Remove '-lstr' option.
+- Move configure into %%build section.
 
 * Tue Jun 01 2010 Marcela Maslanova <mmaslano@xxxxxxxxxx> - 1.3.7-6
 - Mass rebuild with perl-5.12.0
_______________________________________________
ocaml-devel mailing list
ocaml-devel@xxxxxxxxxxxxxxxxxxxxxxx
https://admin.fedoraproject.org/mailman/listinfo/ocaml-devel


[Index of Archives]     [Fedora Users]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [KDE Users]

  Powered by Linux