Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0e42c67e2a238b6e2f8b725bc5e4a6237b6b0d16
commit 0e42c67e2a238b6e2f8b725bc5e4a6237b6b0d16 Author: DeX77 <[email protected]> Date: Wed May 27 22:05:25 2015 +0200 llvm-3.6.1-1-x86_64 * version bump diff --git a/source/devel/llvm/FrugalBuild b/source/devel/llvm/FrugalBuild index ebaf87f..8e00487 100644 --- a/source/devel/llvm/FrugalBuild +++ b/source/devel/llvm/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: Marius Cirsta <[email protected]> pkgname=llvm -pkgver=3.6.0 -pkgrel=4 +pkgver=3.6.1 +pkgrel=1 gcc_ver=4.9.2 url="http://www.llvm.org"; pkgdesc="Low Level Virtual Machine (Compiler , Tools and Libs)" @@ -16,10 +16,11 @@ up2date="Flastarchive $url/releases/download.html .src.tar.xz" source=(http://llvm.org/releases/$pkgver/$pkgname-$pkgver.src.tar.xz \ http://llvm.org/releases/$pkgver/cfe-$pkgver.src.tar.xz \ fix-lib-path.patch \ - fix-ocamldocs.patch) + fix-ocamldocs.patch \ + llvm-3.6.0-ocaml-ctypes-0.4.0.patch) _F_archive_ver="${pkgver}.src" _F_make_opts="${MAKEFLAGS} REQUIRES_RTTI=1" -signatures=("${source[0]}.sig" "${source[1]}.sig" "" "") +signatures=("${source[0]}.sig" "${source[1]}.sig" "" "" "") subpkgs=("${subpkgs[@]}" "clang") subdescs=("${subdescs[@]}" "C language family frontend for LLVM") @@ -72,9 +73,9 @@ build() { Fmake --$_optimized_switch-optimized - Fexec make -C docs -f Makefile.sphinx man || Fdie - Fexec make -C docs -f Makefile.sphinx html || Fdie - Fexec make -C tools/clang/docs -f Makefile.sphinx html || Fdie + Fexec make -C docs -f Makefile.sphinx man + Fexec make -C docs -f Makefile.sphinx html + Fexec make -C tools/clang/docs -f Makefile.sphinx html _F_make_opts="-j1" Fmakeinstall diff --git a/source/devel/llvm/llvm-3.6.0-ocaml-ctypes-0.4.0.patch b/source/devel/llvm/llvm-3.6.0-ocaml-ctypes-0.4.0.patch new file mode 100644 index 0000000..154c9cc --- /dev/null +++ b/source/devel/llvm/llvm-3.6.0-ocaml-ctypes-0.4.0.patch @@ -0,0 +1,35 @@ +diff -Naur llvm-3.6.0.src.orig/bindings/ocaml/executionengine/llvm_executionengine.ml llvm-3.6.0.src/bindings/ocaml/executionengine/llvm_executionengine.ml +--- llvm-3.6.0.src.orig/bindings/ocaml/executionengine/llvm_executionengine.ml 2015-03-17 11:49:27.274824345 +0100 ++++ llvm-3.6.0.src/bindings/ocaml/executionengine/llvm_executionengine.ml 2015-03-17 11:49:40.333829421 +0100 +@@ -43,11 +43,11 @@ + = "llvm_ee_run_static_dtors" + external data_layout : llexecutionengine -> Llvm_target.DataLayout.t + = "llvm_ee_get_data_layout" +-external add_global_mapping_ : Llvm.llvalue -> int64 -> llexecutionengine -> unit ++external add_global_mapping_ : Llvm.llvalue -> nativeint -> llexecutionengine -> unit + = "llvm_ee_add_global_mapping" +-external get_global_value_address_ : string -> llexecutionengine -> int64 ++external get_global_value_address_ : string -> llexecutionengine -> nativeint + = "llvm_ee_get_global_value_address" +-external get_function_address_ : string -> llexecutionengine -> int64 ++external get_function_address_ : string -> llexecutionengine -> nativeint + = "llvm_ee_get_function_address" + + let add_global_mapping llval ptr ee = +@@ -55,14 +55,14 @@ + + let get_global_value_address name typ ee = + let vptr = get_global_value_address_ name ee in +- if Int64.to_int vptr <> 0 then ++ if Nativeint.to_int vptr <> 0 then + let open Ctypes in !@ (coerce (ptr void) (ptr typ) (ptr_of_raw_address vptr)) + else + raise (Error ("Value " ^ name ^ " not found")) + + let get_function_address name typ ee = + let fptr = get_function_address_ name ee in +- if Int64.to_int fptr <> 0 then ++ if Nativeint.to_int fptr <> 0 then + let open Ctypes in coerce (ptr void) typ (ptr_of_raw_address fptr) + else + raise (Error ("Function " ^ name ^ " not found")) _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
