[Pkg-ocaml-maint-commits] [SCM] bin-prot packaging branch, master, updated. debian/1.2.23-1-7-g41f2fd6

Fri Feb 18 06:56:33 UTC 2011

The following commit has been merged in the master branch:
commit 3e66fe8b20e5c2d3abd241925ce27e3918f3fff8
Author: Stephane Glondu <steph at glondu.net>
Date:   Fri Feb 18 07:01:08 2011 +0100

    Switch source package format to 3.0 (quilt)

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..845ca06
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+.pc
diff --git a/Makefile b/Makefile
index a62fe64..4c67b1a 100644
--- a/Makefile
+++ b/Makefile
@@ -3,20 +3,10 @@ all:
 	@cd lib && $(MAKE)
 	@cd lib_test && make
 
-.PHONY: byte
-byte:
-	@cd lib && $(MAKE) byte
-	@cd lib_test && make
-
-
 .PHONY:	install
 install:
 	@cd lib && $(MAKE) $@
 
-.PHONY: libinstall-byte-code
-libinstall-byte-code:
-	@cd lib && $(MAKE) $@
-
 .PHONY:	uninstall
 uninstall:
 	@cd lib && $(MAKE) $@
diff --git a/OCamlMakefile b/OCamlMakefile
index 94e0c4f..830f56e 100644
--- a/OCamlMakefile
+++ b/OCamlMakefile
@@ -1074,7 +1074,6 @@ endif
 
 .c.$(EXT_OBJ):
 			$(OCAMLC) -c -cc "$(CC)" -ccopt "$(CFLAGS) \
-				-fPIC \
 				$(CPPFLAGS) $(CPPFLAGS_WIN32) \
 				$(CFLAGS_WIN32) $(CINCFLAGS) $(CFLAG_O)$@ " $<
 
@@ -1183,7 +1182,7 @@ libinstall:	all
 	$(QUIET)printf "\nInstallation successful.\n"
 
 .PHONY: libinstall-byte-code
-libinstall-byte-code: byte-code
+libinstall-byte-code:	all
 	$(QUIET)printf "\nInstalling byte-code library with ocamlfind\n"
 	$(OCAMLFIND) install $(OCAMLFIND_INSTFLAGS) $(RESULT) META \
 	  $(filter-out $(RESULT).$(EXT_LIB) $(RESULT).cmxa, $(LIBINSTALL_FILES))
diff --git a/debian/patches/0001-support-for-building-installing-only-bytecode.patch b/debian/patches/0001-support-for-building-installing-only-bytecode.patch
new file mode 100644
index 0000000..85226bc
--- /dev/null
+++ b/debian/patches/0001-support-for-building-installing-only-bytecode.patch
@@ -0,0 +1,65 @@
+From: Stefano Zacchiroli <zack at upsilon.cc>
+Date: Sat, 3 May 2008 21:14:06 +0200
+Subject: [PATCH] support for building/installing only bytecode
+
+---
+ Makefile      |   10 ++++++++++
+ OCamlMakefile |    2 +-
+ lib/Makefile  |    5 +++++
+ 3 files changed, 16 insertions(+), 1 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 4c67b1a..a62fe64 100644
+--- a/Makefile
++++ b/Makefile
+@@ -3,10 +3,20 @@ all:
+ 	@cd lib && $(MAKE)
+ 	@cd lib_test && make
+ 
++.PHONY: byte
++byte:
++	@cd lib && $(MAKE) byte
++	@cd lib_test && make
++
++
+ .PHONY:	install
+ install:
+ 	@cd lib && $(MAKE) $@
+ 
++.PHONY: libinstall-byte-code
++libinstall-byte-code:
++	@cd lib && $(MAKE) $@
++
+ .PHONY:	uninstall
+ uninstall:
+ 	@cd lib && $(MAKE) $@
+diff --git a/OCamlMakefile b/OCamlMakefile
+index 830f56e..041252f 100644
+--- a/OCamlMakefile
++++ b/OCamlMakefile
+@@ -1182,7 +1182,7 @@ libinstall:	all
+ 	$(QUIET)printf "\nInstallation successful.\n"
+ 
+ .PHONY: libinstall-byte-code
+-libinstall-byte-code:	all
++libinstall-byte-code: byte-code
+ 	$(QUIET)printf "\nInstalling byte-code library with ocamlfind\n"
+ 	$(OCAMLFIND) install $(OCAMLFIND_INSTFLAGS) $(RESULT) META \
+ 	  $(filter-out $(RESULT).$(EXT_LIB) $(RESULT).cmxa, $(LIBINSTALL_FILES))
+diff --git a/lib/Makefile b/lib/Makefile
+index 5bcb328..0cca65f 100644
+--- a/lib/Makefile
++++ b/lib/Makefile
+@@ -44,6 +44,11 @@ all: \
+ 	byte-code-library native-code-library \
+ 	pa_bin_prot.cmi pa_bin_prot.cmo
+ 
++byte: \
++	pack-byte-code \
++	byte-code-library \
++	pa_bin_prot.cmi pa_bin_prot.cmo
++
+ LIBINSTALL_FILES = \
+   common.mli nat0.mli read_c.mli read_ml.mli size.mli \
+   unsafe_common.mli unsafe_read_c.mli unsafe_write_c.mli \
+-- 
diff --git a/debian/patches/0002-fix-OCamlMakefile-to-ensure-fPIC-is-added-to-build-..patch b/debian/patches/0002-fix-OCamlMakefile-to-ensure-fPIC-is-added-to-build-..patch
new file mode 100644
index 0000000..87cc711
--- /dev/null
+++ b/debian/patches/0002-fix-OCamlMakefile-to-ensure-fPIC-is-added-to-build-..patch
@@ -0,0 +1,22 @@
+From: Stefano Zacchiroli <zack at upsilon.cc>
+Date: Fri, 9 May 2008 15:25:00 +0200
+Subject: [PATCH] fix OCamlMakefile to ensure -fPIC is added to build .o
+
+(fix FTBFS on 64 bit architectures)
+---
+ OCamlMakefile |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/OCamlMakefile b/OCamlMakefile
+index 041252f..94e0c4f 100644
+--- a/OCamlMakefile
++++ b/OCamlMakefile
+@@ -1074,6 +1074,7 @@ endif
+ 
+ .c.$(EXT_OBJ):
+ 			$(OCAMLC) -c -cc "$(CC)" -ccopt "$(CFLAGS) \
++				-fPIC \
+ 				$(CPPFLAGS) $(CPPFLAGS_WIN32) \
+ 				$(CFLAGS_WIN32) $(CINCFLAGS) $(CFLAG_O)$@ " $<
+ 
+-- 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..9b37095
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+0001-support-for-building-installing-only-bytecode.patch
+0002-fix-OCamlMakefile-to-ensure-fPIC-is-added-to-build-..patch
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/source/local-options b/debian/source/local-options
new file mode 100644
index 0000000..c4cf480
--- /dev/null
+++ b/debian/source/local-options
@@ -0,0 +1,2 @@
+abort-on-upstream-changes
+unapply-patches
diff --git a/lib/Makefile b/lib/Makefile
index 0cca65f..5bcb328 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -44,11 +44,6 @@ all: \
 	byte-code-library native-code-library \
 	pa_bin_prot.cmi pa_bin_prot.cmo
 
-byte: \
-	pack-byte-code \
-	byte-code-library \
-	pa_bin_prot.cmi pa_bin_prot.cmo
-
 LIBINSTALL_FILES = \
   common.mli nat0.mli read_c.mli read_ml.mli size.mli \
   unsafe_common.mli unsafe_read_c.mli unsafe_write_c.mli \

-- 
bin-prot packaging

