Author: pluto Date: Thu Feb 9 19:09:26 2012 GMT Module: packages Tag: HEAD ---- Log message: - fix ocaml binding build, release 1.
---- Files affected: packages/llvm: llvm.spec (1.29 -> 1.30) , llvm-bug11177.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/llvm/llvm.spec diff -u packages/llvm/llvm.spec:1.29 packages/llvm/llvm.spec:1.30 --- packages/llvm/llvm.spec:1.29 Thu Feb 9 15:31:09 2012 +++ packages/llvm/llvm.spec Thu Feb 9 20:09:21 2012 @@ -1,8 +1,5 @@ # $Revision$, $Date$ # -# TODO: -# make *** No rule to make target (...)/rpm/BUILD/llvm-3.0.src/obj/bindings/ocaml/llvm/Release/META.llvm, needed by install-meta. -# # Conditional build: %bcond_without ocaml # ocaml binding %bcond_with apidocs # The doxygen docs are HUGE, so they are not built by default. @@ -17,7 +14,7 @@ Summary(pl.UTF-8): Niskopoziomowa maszyna wirtualna (infrastruktura kompilatora optymalizującego) Name: llvm Version: 3.0 -Release: 0.1 +Release: 1 License: University of Illinois/NCSA Open Source License Group: Development/Languages Source0: http://llvm.org/releases/%{version}/%{name}-%{version}.tar.gz @@ -27,6 +24,7 @@ # Data files should be installed with timestamps preserved Patch3: %{name}-2.6-timestamp.patch Patch4: %{name}-pld.patch +Patch5: %{name}-bug11177.patch URL: http://llvm.org/ BuildRequires: bash BuildRequires: bison @@ -246,6 +244,7 @@ mv clang-*.* tools/clang %patch3 -p1 %patch4 -p1 +%patch5 -p0 # configure does not properly specify libdir sed -i 's|(PROJ_prefix)/lib|(PROJ_prefix)/%{_lib}|g' Makefile.config.in @@ -465,11 +464,13 @@ %if %{with ocaml} %files ocaml %defattr(644,root,root,755) +%{_libdir}/ocaml/META.llvm %{_libdir}/ocaml/llvm*.cma %{_libdir}/ocaml/llvm*.cmi %files ocaml-devel %defattr(644,root,root,755) +%{_libdir}/libllvm*.a %{_libdir}/ocaml/libLLVM*.a %{_libdir}/ocaml/libllvm*.a %{_libdir}/ocaml/llvm*.a @@ -487,6 +488,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.30 2012/02/09 19:09:21 pluto +- fix ocaml binding build, release 1. + Revision 1.29 2012/02/09 14:31:09 pluto - updated to 3.0, fixed bcond tests, fixed build without ocaml. - release 0.1 due to ocaml binding build error (see TODO). ================================================================ Index: packages/llvm/llvm-bug11177.patch diff -u /dev/null packages/llvm/llvm-bug11177.patch:1.1 --- /dev/null Thu Feb 9 20:09:26 2012 +++ packages/llvm/llvm-bug11177.patch Thu Feb 9 20:09:21 2012 @@ -0,0 +1,45 @@ +make *** No rule to make target (...)/rpm/BUILD/llvm-3.0.src/obj/bindings/ocaml/llvm/Release/META.llvm, needed by install-meta. + +Index: bindings/ocaml/Makefile.ocaml +=================================================================== +--- bindings/ocaml/Makefile.ocaml (revision 144182) ++++ bindings/ocaml/Makefile.ocaml (revision 144183) +@@ -238,14 +238,14 @@ + # Also install the .mli's (headers) as documentation. + install-cmis: $(OutputsCMI) $(OcamlHeaders) + $(Verb) $(MKDIR) $(PROJ_libocamldir) ++ $(Verb) for i in $(OcamlHeaders:$(ObjDir)/%=%); do \ ++ $(EchoCmd) "Installing $(BuildMode) $(PROJ_libocamldir)/$$i"; \ ++ $(DataInstall) $(ObjDir)/$$i "$(PROJ_libocamldir)/$$i"; \ ++ done + $(Verb) for i in $(OutputsCMI:$(OcamlDir)/%=%); do \ + $(EchoCmd) "Installing $(BuildMode) $(PROJ_libocamldir)/$$i"; \ + $(DataInstall) $(OcamlDir)/$$i "$(PROJ_libocamldir)/$$i"; \ + done +- $(Verb) for i in $(OcamlHeaders:$(ObjDir)/%=%); do \ +- $(EchoCmd) "Installing $(BuildMode) $(PROJ_libocamldir)/$$i"; \ +- $(DataInstall) $(ObjDir)/$$i "$(PROJ_libocamldir)/$$i"; \ +- done + + uninstall-cmis:: + $(Verb) for i in $(OutputsCMI:$(OcamlDir)/%=%); do \ +Index: bindings/ocaml/llvm/Makefile +=================================================================== +--- bindings/ocaml/llvm/Makefile (revision 144182) ++++ bindings/ocaml/llvm/Makefile (revision 144183) +@@ -30,11 +30,13 @@ + $(OcamlDir)/META.llvm: META.llvm + $(Verb) $(CP) -f $< $@ + +-install-meta:: $(ObjDir)/META.llvm ++install-meta:: $(OcamlDir)/META.llvm + $(Echo) "Install $(BuildMode) $(DestMETA)" + $(Verb) $(MKDIR) $(PROJ_libocamldir) +- $(Verb) $(DataInstall) META.llvm "$(DestMETA)" ++ $(Verb) $(DataInstall) $< "$(DestMETA)" + + uninstall-meta:: + $(Echo) "Uninstalling $(DestMETA)" + -$(Verb) $(RM) -f "$(DestMETA)" ++ ++.PHONY: copy-meta install-meta uninstall-meta ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/llvm/llvm.spec?r1=1.29&r2=1.30&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
