[Pkg-ocaml-maint-commits] [SCM] janest-core packaging branch, master, updated. debian/0.5.3-1-30-g3a2c035

[Stefano Zacchiroli]

The following commit has been merged in the master branch:
commit 3a2c0353b1a4d15a950308e2e134a1aaa5e23bb3
Author: Stefano Zacchiroli <zack at upsilon.cc>
Date:   Thu Nov 12 12:30:54 2009 +0100

    bytecode only compilation fix for Core_extended
    
    when nativecode compiler is not available, instead of compiling in bytecode
    only Core, also compile (in bytecode only) Core_extended

diff --git a/debian/patches/0002-extra-targets-to-enable-compilation-of-byte-code-onl.patch b/debian/patches/0002-extra-targets-to-enable-compilation-of-byte-code-onl.patch
index f58f2a1..638bbd8 100644
--- a/debian/patches/0002-extra-targets-to-enable-compilation-of-byte-code-onl.patch
+++ b/debian/patches/0002-extra-targets-to-enable-compilation-of-byte-code-onl.patch
@@ -3,30 +3,44 @@ Date: Sat, 3 May 2008 22:39:34 +0200
 Subject: [PATCH] extra targets to enable compilation of byte code only
 
 Signed-off-by: Stefano Zacchiroli <zack at upsilon.cc>
-Signed-off-by: Stephane Glondu <steph at glondu.net>
 ---
- Makefile     |   10 ++++++++++
- lib/Makefile |    1 +
- 2 files changed, 11 insertions(+), 0 deletions(-)
+ Makefile          |   12 ++++++++++++
+ extended/Makefile |    1 +
+ lib/Makefile      |    1 +
+ 3 files changed, 14 insertions(+), 0 deletions(-)
 
 diff --git a/Makefile b/Makefile
-index 04a3d60..5a12487 100644
+index 04a3d60..746dca2 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -17,3 +17,13 @@ uninstall:
+@@ -17,3 +17,15 @@ uninstall:
  clean:
  	@cd lib && $(MAKE) clean
  	@cd extended && $(MAKE) clean
 +
 +.PHONY: byte
 +byte:
-+	@cd lib && $(MAKE) byte
++	@cd lib && $(MAKE) $@
 +	@cd lib_test && make
++	@cd extended && $(MAKE) $@
 +
 +.PHONY:	libinstall-byte-code
 +libinstall-byte-code:
 +	@cd lib && $(MAKE) $@
++	@cd extended && $(MAKE) $@
 +
+diff --git a/extended/Makefile b/extended/Makefile
+index b044c16..dc777ee 100644
+--- a/extended/Makefile
++++ b/extended/Makefile
+@@ -114,6 +114,7 @@ THREADS = yes
+ ANNOTATE = true
+ 
+ all: byte-code-library native-code-library
++byte: byte-code-library
+ 
+ LIBINSTALL_FILES = \
+   core_extended.cmi core_extended.cma core_extended.cmxa core_extended.a libcore_extended_stubs.a dllcore_extended_stubs.so
 diff --git a/lib/Makefile b/lib/Makefile
 index ab1c8d8..d2af679 100644
 --- a/lib/Makefile
@@ -40,5 +54,3 @@ index ab1c8d8..d2af679 100644
  LIBINSTALL_FILES = \
    core.cmi core.cma core.cmxa core.a libcore_stubs.a dllcore_stubs.so
 -- 
-1.6.5.2
-
diff --git a/debian/patches/0003-add-missing-META-dep-on-unix.patch b/debian/patches/0003-add-missing-META-dep-on-unix.patch
index c49b253..6b7b4a6 100644
--- a/debian/patches/0003-add-missing-META-dep-on-unix.patch
+++ b/debian/patches/0003-add-missing-META-dep-on-unix.patch
@@ -22,5 +22,3 @@ index 60ca7f9..63258b5 100644
  archive(byte) = "core.cma"
  archive(native) = "core.cmxa"
 -- 
-1.6.5.2
-
diff --git a/debian/patches/0004-Fix-build-on-kfreebsd.patch b/debian/patches/0004-Fix-build-on-kfreebsd.patch
index c66a116..510f997 100644
--- a/debian/patches/0004-Fix-build-on-kfreebsd.patch
+++ b/debian/patches/0004-Fix-build-on-kfreebsd.patch
@@ -1,4 +1,3 @@
-From 8af6797262e6a3c5296b0935f807fc585e8cd6c2 Mon Sep 17 00:00:00 2001
 From: Stefano Zacchiroli <zack at upsilon.cc>
 Date: Mon, 9 Nov 2009 13:23:05 +0100
 Subject: [PATCH] Fix build on kfreebsd
@@ -8,7 +7,7 @@ Subject: [PATCH] Fix build on kfreebsd
  1 files changed, 5 insertions(+), 1 deletions(-)
 
 diff --git a/lib/Makefile b/lib/Makefile
-index ab1c8d8..741f697 100644
+index d2af679..40eabae 100644
 --- a/lib/Makefile
 +++ b/lib/Makefile
 @@ -1,9 +1,13 @@
@@ -27,5 +26,3 @@ index ab1c8d8..741f697 100644
  
  SOURCES = \
 -- 
-1.6.5.2
-

-- 
janest-core packaging