Commit 6e0764bd authored by Stephane Glondu's avatar Stephane Glondu

Remove patches (merged upstream)

parent 62205d37
From: Stephane Glondu <steph@glondu.net>
Date: Sat, 2 Jul 2011 17:56:41 +0200
Subject: Add missing -cclib in ocamlc -a
This allows simple linking with -custom by naming only .cma files
(used by advi).
Remark: runtime support libraries (dll*.so, lib*.a) and the OCaml
archives (*.cma, *.cmxa) are built in an ad-hoc way using ocamlmklib,
ocamlc -a and ocamlopt -a. It would be better (but more intrusive) to
use only ocamlmklib.
Signed-off-by: Stephane Glondu <steph@glondu.net>
---
src/OMakefile | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/OMakefile b/src/OMakefile
index e198fa1..013164f 100644
--- a/src/OMakefile
+++ b/src/OMakefile
@@ -225,7 +225,7 @@ MakeLibOCaml(name) =
$(LIBRARY_PREFIX)_$(name).cma $(LIBRARY_PREFIX)_$(name).cmxa: $(MakeLibC $(name))
# OCAML_{BYTE,NATIVE}_LINK_FLAGS do not work for OCamlLibrary
# Bit dirty workaround
- OCAMLCFLAGS+=-dllib -l$(LIBRARY_PREFIX)_$(name)
+ OCAMLCFLAGS+=-dllib -l$(LIBRARY_PREFIX)_$(name) -cclib -l$(LIBRARY_PREFIX)_$(name)
OCAMLOPTFLAGS+=-cclib -l$(LIBRARY_PREFIX)_$(name)
# use mapprefix instead of addprefix, otherwise "-cclib -lgif"
# is considered one option.
--
Index: camlimages/src/bitmap.ml
===================================================================
--- camlimages.orig/src/bitmap.ml 2011-10-17 00:02:17.941672767 +0200
+++ camlimages/src/bitmap.ml 2011-10-17 00:04:03.732755736 +0200
@@ -186,7 +186,7 @@
let swap_out_eldest words =
let sorted =
- Sort.list (fun b1 b2 -> b1.last_used < b2.last_used) !swappable_blocks in
+ List.sort (fun b1 b2 -> compare b1.last_used b2.last_used) !swappable_blocks in
let rec swapper sorted i =
match sorted with
| [] -> ()
Remove mentions of non-existant archives.
Index: camlimages/src/META.in
===================================================================
--- camlimages.orig/src/META.in 2011-08-04 22:11:48.000000000 -0500
+++ camlimages/src/META.in 2011-08-04 22:12:00.000000000 -0500
@@ -2,9 +2,6 @@
version = "@PACKAGE_VERSION@"
description = "Objective Caml image processing library"
-archive(byte) = "camlimages.cma"
-archive(native) = "camlimages.cmxa"
-
package "core" (
archive(byte) = "camlimages_core.cma"
archive(native) = "camlimages_core.cmxa"
0001-Add-missing-cclib-in-ocamlc-a.patch
0002-remove-use-of-sort.patch
0003-fix-META.patch
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment